Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/
Date: Mon, 12 Jul 2021 23:53:57
Message-Id: 1626133950.9362ab0778647db45c4237a1b28b33ea4381e6c4.marecki@gentoo
1 commit: 9362ab0778647db45c4237a1b28b33ea4381e6c4
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 12 22:05:35 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 12 23:52:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9362ab07
7
8 net-libs/nodejs: block openssl-3 in v12 and v14 ebuilds
9
10 v14 confirmed not to build, v12 contains the same code so it is assumed
11 not to work either.
12 Hopefully temporary, given v16 already builds against this version
13 of OpenSSL.
14
15 Closes: https://bugs.gentoo.org/801952
16 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
17
18 net-libs/nodejs/nodejs-12.22.1.ebuild | 7 +++++--
19 net-libs/nodejs/nodejs-12.22.2.ebuild | 7 +++++--
20 net-libs/nodejs/nodejs-14.16.1.ebuild | 7 +++++--
21 net-libs/nodejs/nodejs-14.17.3.ebuild | 7 +++++--
22 net-libs/nodejs/nodejs-16.4.2.ebuild | 2 +-
23 net-libs/nodejs/nodejs-99999999.ebuild | 2 +-
24 6 files changed, 22 insertions(+), 10 deletions(-)
25
26 diff --git a/net-libs/nodejs/nodejs-12.22.1.ebuild b/net-libs/nodejs/nodejs-12.22.1.ebuild
27 index 3c19482c9e7..930eb364bbf 100644
28 --- a/net-libs/nodejs/nodejs-12.22.1.ebuild
29 +++ b/net-libs/nodejs/nodejs-12.22.1.ebuild
30 @@ -3,7 +3,7 @@
31
32 EAPI=7
33
34 -PYTHON_COMPAT=( python3_{7..9} )
35 +PYTHON_COMPAT=( python3_{8..9} )
36 PYTHON_REQ_USE="threads(+)"
37
38 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
39 @@ -32,7 +32,10 @@ RDEPEND="
40 >=net-libs/nghttp2-1.40.0
41 sys-libs/zlib
42 icu? ( >=dev-libs/icu-64.2:= )
43 - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
44 + system-ssl? (
45 + >=dev-libs/openssl-1.1.1:0=
46 + <dev-libs/openssl-3.0.0_beta1:0=
47 + )
48 "
49 BDEPEND="
50 ${PYTHON_DEPS}
51
52 diff --git a/net-libs/nodejs/nodejs-12.22.2.ebuild b/net-libs/nodejs/nodejs-12.22.2.ebuild
53 index 9c4fe05c005..7b4c525b98b 100644
54 --- a/net-libs/nodejs/nodejs-12.22.2.ebuild
55 +++ b/net-libs/nodejs/nodejs-12.22.2.ebuild
56 @@ -3,7 +3,7 @@
57
58 EAPI=7
59
60 -PYTHON_COMPAT=( python3_{7..10} )
61 +PYTHON_COMPAT=( python3_{8..10} )
62 PYTHON_REQ_USE="threads(+)"
63
64 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
65 @@ -40,7 +40,10 @@ RDEPEND="
66 >=net-libs/nghttp2-1.40.0
67 sys-libs/zlib
68 icu? ( >=dev-libs/icu-64.2:= )
69 - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
70 + system-ssl? (
71 + >=dev-libs/openssl-1.1.1:0=
72 + <dev-libs/openssl-3.0.0_beta1:0=
73 + )
74 "
75 BDEPEND="
76 ${PYTHON_DEPS}
77
78 diff --git a/net-libs/nodejs/nodejs-14.16.1.ebuild b/net-libs/nodejs/nodejs-14.16.1.ebuild
79 index 45b882f86ba..6143804f9ac 100644
80 --- a/net-libs/nodejs/nodejs-14.16.1.ebuild
81 +++ b/net-libs/nodejs/nodejs-14.16.1.ebuild
82 @@ -3,7 +3,7 @@
83
84 EAPI=7
85
86 -PYTHON_COMPAT=( python3_{7..9} )
87 +PYTHON_COMPAT=( python3_{8..9} )
88 PYTHON_REQ_USE="threads(+)"
89
90 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
91 @@ -31,7 +31,10 @@ RDEPEND=">=app-arch/brotli-1.0.9
92 >=net-libs/nghttp2-1.41.0
93 sys-libs/zlib
94 system-icu? ( >=dev-libs/icu-67:= )
95 - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
96 + system-ssl? (
97 + >=dev-libs/openssl-1.1.1:0=
98 + <dev-libs/openssl-3.0.0_beta1:0=
99 + )"
100 BDEPEND="${PYTHON_DEPS}
101 sys-apps/coreutils
102 virtual/pkgconfig
103
104 diff --git a/net-libs/nodejs/nodejs-14.17.3.ebuild b/net-libs/nodejs/nodejs-14.17.3.ebuild
105 index a6c178ef153..5a7dfca4e03 100644
106 --- a/net-libs/nodejs/nodejs-14.17.3.ebuild
107 +++ b/net-libs/nodejs/nodejs-14.17.3.ebuild
108 @@ -3,7 +3,7 @@
109
110 EAPI=7
111
112 -PYTHON_COMPAT=( python3_{7..10} )
113 +PYTHON_COMPAT=( python3_{8..10} )
114 PYTHON_REQ_USE="threads(+)"
115
116 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
117 @@ -37,7 +37,10 @@ RDEPEND=">=app-arch/brotli-1.0.9
118 >=net-libs/nghttp2-1.41.0
119 sys-libs/zlib
120 system-icu? ( >=dev-libs/icu-67:= )
121 - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
122 + system-ssl? (
123 + >=dev-libs/openssl-1.1.1:0=
124 + <dev-libs/openssl-3.0.0_beta1:0=
125 + )"
126 BDEPEND="${PYTHON_DEPS}
127 sys-apps/coreutils
128 virtual/pkgconfig
129
130 diff --git a/net-libs/nodejs/nodejs-16.4.2.ebuild b/net-libs/nodejs/nodejs-16.4.2.ebuild
131 index 15a3869fc67..b60abe36d65 100644
132 --- a/net-libs/nodejs/nodejs-16.4.2.ebuild
133 +++ b/net-libs/nodejs/nodejs-16.4.2.ebuild
134 @@ -3,7 +3,7 @@
135
136 EAPI=7
137
138 -PYTHON_COMPAT=( python3_{7..10} )
139 +PYTHON_COMPAT=( python3_{8..10} )
140 PYTHON_REQ_USE="threads(+)"
141
142 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
143
144 diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
145 index 1141e04146e..a2a2634d16c 100644
146 --- a/net-libs/nodejs/nodejs-99999999.ebuild
147 +++ b/net-libs/nodejs/nodejs-99999999.ebuild
148 @@ -3,7 +3,7 @@
149
150 EAPI=7
151
152 -PYTHON_COMPAT=( python3_{7..10} )
153 +PYTHON_COMPAT=( python3_{8..10} )
154 PYTHON_REQ_USE="threads(+)"
155
156 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils