commit: 37ec456ffe51429e00c9dccfedd8686543046568 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Aug 14 05:45:20 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Aug 14 05:47:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ec456f
net-libs/nodejs: Inherit python-any-r1 instead of python-single-r1 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Bug: https://bugs.gentoo.org/692074 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-libs/nodejs/nodejs-0.12.18.ebuild | 5 ++--- net-libs/nodejs/nodejs-10.15.3.ebuild | 3 +-- net-libs/nodejs/nodejs-10.16.0.ebuild | 3 +-- net-libs/nodejs/nodejs-10.16.2.ebuild | 3 +-- net-libs/nodejs/nodejs-11.14.0.ebuild | 3 +-- net-libs/nodejs/nodejs-11.15.0.ebuild | 3 +-- net-libs/nodejs/nodejs-12.7.0.ebuild | 3 +-- net-libs/nodejs/nodejs-12.8.0.ebuild | 3 +-- net-libs/nodejs/nodejs-4.9.1.ebuild | 5 ++--- net-libs/nodejs/nodejs-6.14.4.ebuild | 5 ++--- net-libs/nodejs/nodejs-6.17.1.ebuild | 3 +-- net-libs/nodejs/nodejs-8.12.0.ebuild | 5 ++--- net-libs/nodejs/nodejs-8.16.0.ebuild | 3 +-- net-libs/nodejs/nodejs-99999999.ebuild | 3 +-- 14 files changed, 18 insertions(+), 32 deletions(-) diff --git a/net-libs/nodejs/nodejs-0.12.18.ebuild b/net-libs/nodejs/nodejs-0.12.18.ebuild index f45d645a9c5..40890e98679 100644 --- a/net-libs/nodejs/nodejs-0.12.18.ebuild +++ b/net-libs/nodejs/nodejs-0.12.18.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 @@ -9,7 +9,7 @@ RESTRICT="test" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit pax-utils python-single-r1 toolchain-funcs +inherit pax-utils python-any-r1 toolchain-funcs DESCRIPTION="Evented IO for V8 Javascript" HOMEPAGE="http://nodejs.org/"; @@ -28,7 +28,6 @@ RDEPEND="icu? ( dev-libs/icu ) DEPEND="${RDEPEND}" S="${WORKDIR}/node-v${PV}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { tc-export CC CXX PKG_CONFIG diff --git a/net-libs/nodejs/nodejs-10.15.3.ebuild b/net-libs/nodejs/nodejs-10.15.3.ebuild index b11ce9d0f9f..402fcfc9804 100644 --- a/net-libs/nodejs/nodejs-10.15.3.ebuild +++ b/net-libs/nodejs/nodejs-10.15.3.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -17,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-10.16.0.ebuild b/net-libs/nodejs/nodejs-10.16.0.ebuild index c55a7a4b975..f04f7f06504 100644 --- a/net-libs/nodejs/nodejs-10.16.0.ebuild +++ b/net-libs/nodejs/nodejs-10.16.0.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -17,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-10.16.2.ebuild b/net-libs/nodejs/nodejs-10.16.2.ebuild index c55a7a4b975..f04f7f06504 100644 --- a/net-libs/nodejs/nodejs-10.16.2.ebuild +++ b/net-libs/nodejs/nodejs-10.16.2.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -17,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-11.14.0.ebuild b/net-libs/nodejs/nodejs-11.14.0.ebuild index 9ecdc16ab4e..b59441c56a2 100644 --- a/net-libs/nodejs/nodejs-11.14.0.ebuild +++ b/net-libs/nodejs/nodejs-11.14.0.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -17,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-11.15.0.ebuild b/net-libs/nodejs/nodejs-11.15.0.ebuild index a4d1604959a..2abeb82f572 100644 --- a/net-libs/nodejs/nodejs-11.15.0.ebuild +++ b/net-libs/nodejs/nodejs-11.15.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -15,7 +15,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-12.7.0.ebuild b/net-libs/nodejs/nodejs-12.7.0.ebuild index aacd0ea8457..7b13a5877e4 100644 --- a/net-libs/nodejs/nodejs-12.7.0.ebuild +++ b/net-libs/nodejs/nodejs-12.7.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -15,7 +15,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-12.8.0.ebuild b/net-libs/nodejs/nodejs-12.8.0.ebuild index aacd0ea8457..7b13a5877e4 100644 --- a/net-libs/nodejs/nodejs-12.8.0.ebuild +++ b/net-libs/nodejs/nodejs-12.8.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -15,7 +15,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-4.9.1.ebuild b/net-libs/nodejs/nodejs-4.9.1.ebuild index d3f61ffab16..4c5b0406dda 100644 --- a/net-libs/nodejs/nodejs-4.9.1.ebuild +++ b/net-libs/nodejs/nodejs-4.9.1.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 @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -28,7 +28,6 @@ DEPEND="${RDEPEND} test? ( net-misc/curl )" S="${WORKDIR}/node-v${PV}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ diff --git a/net-libs/nodejs/nodejs-6.14.4.ebuild b/net-libs/nodejs/nodejs-6.14.4.ebuild index 82d1e57e437..909ebd44dfe 100644 --- a/net-libs/nodejs/nodejs-6.14.4.ebuild +++ b/net-libs/nodejs/nodejs-6.14.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -17,7 +17,6 @@ SLOT="0" KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) " diff --git a/net-libs/nodejs/nodejs-6.17.1.ebuild b/net-libs/nodejs/nodejs-6.17.1.ebuild index 8db127221fd..814a80538d1 100644 --- a/net-libs/nodejs/nodejs-6.17.1.ebuild +++ b/net-libs/nodejs/nodejs-6.17.1.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -17,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) " diff --git a/net-libs/nodejs/nodejs-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild index ff4d5a46bf5..afa60f606e0 100644 --- a/net-libs/nodejs/nodejs-8.12.0.ebuild +++ b/net-libs/nodejs/nodejs-8.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ RESTRICT="test" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -18,7 +18,6 @@ SLOT="0" KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-8.16.0.ebuild b/net-libs/nodejs/nodejs-8.16.0.ebuild index 059aa2d524e..8ea43457082 100644 --- a/net-libs/nodejs/nodejs-8.16.0.ebuild +++ b/net-libs/nodejs/nodejs-8.16.0.ebuild @@ -7,7 +7,7 @@ RESTRICT="test" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -18,7 +18,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) " diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 4a4a27553da..b660199af75 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs +inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; @@ -15,7 +15,6 @@ SLOT="0" KEYWORDS="" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} inspector? ( icu ssl ) npm? ( ssl ) "
