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@gentoo.org>

diff --git a/net-libs/nodejs/nodejs-0.12.18.ebuild b/net-libs/nodejs/nodejs-0.12.18.ebuild
index f45d645a9c59f959d927a102fcf837a6391d6b47..40890e986795b5abb0e6dba53a9b3a4e1700230a 100644 (file)
--- 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 b11ce9d0f9f295bb4ab896119b6a9dd7ac25771a..402fcfc98049994fcc683e8d98937560f30c70e9 100644 (file)
--- 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 c55a7a4b9751333c7e74537766d2b3f664a32888..f04f7f065047227fbd15ec8cb38d19a32b345236 100644 (file)
--- 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 c55a7a4b9751333c7e74537766d2b3f664a32888..f04f7f065047227fbd15ec8cb38d19a32b345236 100644 (file)
--- 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 9ecdc16ab4ed0d9fb02a35e4e319ffb73503c4c8..b59441c56a2f314ed3fbf58f49da82aec912ee0c 100644 (file)
--- 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 a4d1604959a0b8cb344a8e8e88b895a9a525bff6..2abeb82f5724bdc969b5efba8a0278dd4df91235 100644 (file)
--- 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 aacd0ea84574d2ad22ae25413e0f9dbf385c03d6..7b13a5877e47a229aba40bd827bce9a0422d8563 100644 (file)
--- 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 aacd0ea84574d2ad22ae25413e0f9dbf385c03d6..7b13a5877e47a229aba40bd827bce9a0422d8563 100644 (file)
--- 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 d3f61ffab162b302b31504ef3ea749519af55f35..4c5b0406ddadd2905e1590cc01b0b0f8788fd656 100644 (file)
--- 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 82d1e57e43780c0be55d6c9d399bf6f8f02e1a9e..909ebd44dfec887870704a89994d898a16ba15eb 100644 (file)
--- 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 8db127221fd8722c16430e8d74e9b9bd107b42b3..814a80538d18d9f1c1b2c00ab4cc49a747b549fe 100644 (file)
--- 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 ff4d5a46bf53a3ccffa94b737262e956bac2105c..afa60f606e05251a3486fc5c4b6be2aaa3f62cd1 100644 (file)
--- 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 059aa2d524eaadf65743d911a2decfa452d1461a..8ea43457082cf330aafe699d1b231fcc0bade753 100644 (file)
--- 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 4a4a27553dad1364b000256a40a61cf54a18d969..b660199af758c1a97815d2384c0500b54ee962a9 100644 (file)
--- 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 )
 "