[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/ - gentoo-commits

From:	Stefan Strogin <steils@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/
Date:	Tue, 25 Feb 2020 05:19:31
Message-Id:	`1582607833.c26bf678ea85fdbbbe8d3d14908cd25ca94397c4.steils@gentoo`

1

commit:     c26bf678ea85fdbbbe8d3d14908cd25ca94397c4

2

Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jan 26 14:34:35 2020 +0000

4

Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>

5

CommitDate: Tue Feb 25 05:17:13 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26bf678

7

8

net-libs/nodejs: add USE=+system-ssl

9

10

For now net-libs/nodejs fails to build on LibreSSL systems.

11

Add USE=+system-ssl which can be explicitly disabled in order to use

12

bundled OpenSSL.

13

14

Bug: https://bugs.gentoo.org/613344

15

Closes: https://github.com/gentoo/gentoo/pull/14460

16

Package-Manager: Portage-2.3.85, Repoman-2.3.20

17

Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

18

19

 net-libs/nodejs/metadata.xml           | 1 +

20

 net-libs/nodejs/nodejs-10.19.0.ebuild  | 7 ++++---

21

 net-libs/nodejs/nodejs-12.16.1.ebuild  | 7 ++++---

22

 net-libs/nodejs/nodejs-13.9.0.ebuild   | 7 ++++---

23

 net-libs/nodejs/nodejs-99999999.ebuild | 7 ++++---

24

 5 files changed, 17 insertions(+), 12 deletions(-)

25

26

diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml

27

index 3f344f0d8ed..3e9bb1da9c0 100644

28

--- a/net-libs/nodejs/metadata.xml

29

+++ b/net-libs/nodejs/metadata.xml

30

@@ -9,6 +9,7 @@

31

 		<flag name="npm">Enable NPM package manager</flag>

32

 		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>

33

 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>

34

+		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>

35

 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>

36

 	</use>

37

 </pkgmetadata>

38

39

diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild

40

index 31d605f6adb..db37b4f3518 100644

41

--- a/net-libs/nodejs/nodejs-10.19.0.ebuild

42

+++ b/net-libs/nodejs/nodejs-10.19.0.ebuild

43

@@ -13,10 +13,11 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"

44

 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"

45

 SLOT="0"

46

 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"

47

-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"

48

+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"

49

 REQUIRED_USE="

50

 	inspector? ( icu ssl )

51

 	npm? ( ssl )

52

+	system-ssl? ( ssl )

53

"

54

55

 RDEPEND="

56

@@ -26,7 +27,7 @@ RDEPEND="

57

 	>=net-libs/nghttp2-1.39.2

58

 	sys-libs/zlib

59

 	icu? ( >=dev-libs/icu-64.2:= )

60

-	ssl? ( >=dev-libs/openssl-1.1.1:0= )

61

+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )

62

"

63

 DEPEND="

64

 	${RDEPEND}

65

@@ -99,7 +100,7 @@ src_configure() {

66

 	use inspector || myconf+=( --without-inspector )

67

 	use npm || myconf+=( --without-npm )

68

 	use snapshot && myconf+=( --with-snapshot )

69

-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )

70

+	use ssl && ( use system-ssl && myconf+=( --shared-openssl ) ) || myconf+=( --without-ssl )

71

72

 	local myarch=""

73

 	case ${ABI} in

74

75

diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild

76

index 3850f958b73..6c929f70278 100644

77

--- a/net-libs/nodejs/nodejs-12.16.1.ebuild

78

+++ b/net-libs/nodejs/nodejs-12.16.1.ebuild

79

@@ -15,10 +15,11 @@ SRC_URI="

80

 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"

81

 SLOT="0"

82

 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"

83

-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"

84

+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"

85

 REQUIRED_USE="

86

 	inspector? ( icu ssl )

87

 	npm? ( ssl )

88

+	system-ssl? ( ssl )

89

"

90

91

 RDEPEND="

92

@@ -28,7 +29,7 @@ RDEPEND="

93

 	>=net-libs/nghttp2-1.40.0

94

 	sys-libs/zlib

95

 	icu? ( >=dev-libs/icu-64.2:= )

96

-	ssl? ( >=dev-libs/openssl-1.1.1:0= )

97

+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )

98

"

99

 BDEPEND="

100

 	${PYTHON_DEPS}

101

@@ -106,7 +107,7 @@ src_configure() {

102

 	use inspector || myconf+=( --without-inspector )

103

 	use npm || myconf+=( --without-npm )

104

 	use snapshot || myconf+=( --without-node-snapshot )

105

-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )

106

+	use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl )

107

108

 	local myarch=""

109

 	case ${ABI} in

110

111

diff --git a/net-libs/nodejs/nodejs-13.9.0.ebuild b/net-libs/nodejs/nodejs-13.9.0.ebuild

112

index aefd3239857..4d35b088093 100644

113

--- a/net-libs/nodejs/nodejs-13.9.0.ebuild

114

+++ b/net-libs/nodejs/nodejs-13.9.0.ebuild

115

@@ -15,10 +15,11 @@ SRC_URI="

116

 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"

117

 SLOT="0"

118

 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"

119

-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"

120

+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"

121

 REQUIRED_USE="

122

 	inspector? ( icu ssl )

123

 	npm? ( ssl )

124

+	system-ssl? ( ssl )

125

"

126

127

 RDEPEND="

128

@@ -27,7 +28,7 @@ RDEPEND="

129

 	>=net-libs/nghttp2-1.40.0

130

 	sys-libs/zlib

131

 	icu? ( >=dev-libs/icu-64.2:= )

132

-	ssl? ( >=dev-libs/openssl-1.1.1:0= )

133

+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )

134

"

135

 BDEPEND="

136

 	${PYTHON_DEPS}

137

@@ -104,7 +105,7 @@ src_configure() {

138

 	use inspector || myconf+=( --without-inspector )

139

 	use npm || myconf+=( --without-npm )

140

 	use snapshot || myconf+=( --without-node-snapshot )

141

-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )

142

+	use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl )

143

144

 	local myarch=""

145

 	case ${ABI} in

146

147

diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild

148

index 00962bc7bcb..71618f3c523 100644

149

--- a/net-libs/nodejs/nodejs-99999999.ebuild

150

+++ b/net-libs/nodejs/nodejs-99999999.ebuild

151

@@ -13,11 +13,12 @@ EGIT_REPO_URI="https://github.com/nodejs/node"

152

 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"

153

 SLOT="0"

154

 KEYWORDS=""

155

-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"

156

+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"

157

 RESTRICT="!test? ( test )"

158

 REQUIRED_USE="

159

 	inspector? ( icu ssl )

160

 	npm? ( ssl )

161

+	system-ssl? ( ssl )

162

"

163

164

 RDEPEND="

165

@@ -26,7 +27,7 @@ RDEPEND="

166

 	>=net-libs/nghttp2-1.39.2

167

 	sys-libs/zlib

168

 	icu? ( >=dev-libs/icu-64.2:= )

169

-	ssl? ( >=dev-libs/openssl-1.1.1:0= )

170

+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )

171

"

172

 BDEPEND="

173

 	${PYTHON_DEPS}

174

@@ -101,7 +102,7 @@ src_configure() {

175

 	use inspector || myconf+=( --without-inspector )

176

 	use npm || myconf+=( --without-npm )

177

 	use snapshot || myconf+=( --without-node-snapshot )

178

-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )

179

+	use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl )

180

181

 	local myarch=""

182

 	case ${ABI} in

1	commit: c26bf678ea85fdbbbe8d3d14908cd25ca94397c4
2	Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jan 26 14:34:35 2020 +0000
4	Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5	CommitDate: Tue Feb 25 05:17:13 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26bf678
7
8	net-libs/nodejs: add USE=+system-ssl
9
10	For now net-libs/nodejs fails to build on LibreSSL systems.
11	Add USE=+system-ssl which can be explicitly disabled in order to use
12	bundled OpenSSL.
13
14	Bug: https://bugs.gentoo.org/613344
15	Closes: https://github.com/gentoo/gentoo/pull/14460
16	Package-Manager: Portage-2.3.85, Repoman-2.3.20
17	Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
18
19	net-libs/nodejs/metadata.xml \| 1 +
20	net-libs/nodejs/nodejs-10.19.0.ebuild \| 7 ++++---
21	net-libs/nodejs/nodejs-12.16.1.ebuild \| 7 ++++---
22	net-libs/nodejs/nodejs-13.9.0.ebuild \| 7 ++++---
23	net-libs/nodejs/nodejs-99999999.ebuild \| 7 ++++---
24	5 files changed, 17 insertions(+), 12 deletions(-)
25
26	diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
27	index 3f344f0d8ed..3e9bb1da9c0 100644
28	--- a/net-libs/nodejs/metadata.xml
29	+++ b/net-libs/nodejs/metadata.xml
30	@@ -9,6 +9,7 @@
31	<flag name="npm">Enable NPM package manager</flag>
32	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
33	<flag name="snapshot">Enable snapshot creation for faster startup</flag>
34	+ <flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
35	<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
36	</use>
37	</pkgmetadata>
38
39	diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild
40	index 31d605f6adb..db37b4f3518 100644
41	--- a/net-libs/nodejs/nodejs-10.19.0.ebuild
42	+++ b/net-libs/nodejs/nodejs-10.19.0.ebuild
43	@@ -13,10 +13,11 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
44	LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
45	SLOT="0"
46	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
47	-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
48	+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
49	REQUIRED_USE="
50	inspector? ( icu ssl )
51	npm? ( ssl )
52	+ system-ssl? ( ssl )
53	"
54
55	RDEPEND="
56	@@ -26,7 +27,7 @@ RDEPEND="
57	>=net-libs/nghttp2-1.39.2
58	sys-libs/zlib
59	icu? ( >=dev-libs/icu-64.2:= )
60	- ssl? ( >=dev-libs/openssl-1.1.1:0= )
61	+ system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
62	"
63	DEPEND="
64	${RDEPEND}
65	@@ -99,7 +100,7 @@ src_configure() {
66	use inspector \|\| myconf+=( --without-inspector )
67	use npm \|\| myconf+=( --without-npm )
68	use snapshot && myconf+=( --with-snapshot )
69	- use ssl && myconf+=( --shared-openssl ) \|\| myconf+=( --without-ssl )
70	+ use ssl && ( use system-ssl && myconf+=( --shared-openssl ) ) \|\| myconf+=( --without-ssl )
71
72	local myarch=""
73	case ${ABI} in
74
75	diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild
76	index 3850f958b73..6c929f70278 100644
77	--- a/net-libs/nodejs/nodejs-12.16.1.ebuild
78	+++ b/net-libs/nodejs/nodejs-12.16.1.ebuild
79	@@ -15,10 +15,11 @@ SRC_URI="
80	LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
81	SLOT="0"
82	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
83	-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
84	+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
85	REQUIRED_USE="
86	inspector? ( icu ssl )
87	npm? ( ssl )
88	+ system-ssl? ( ssl )
89	"
90
91	RDEPEND="
92	@@ -28,7 +29,7 @@ RDEPEND="
93	>=net-libs/nghttp2-1.40.0
94	sys-libs/zlib
95	icu? ( >=dev-libs/icu-64.2:= )
96	- ssl? ( >=dev-libs/openssl-1.1.1:0= )
97	+ system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
98	"
99	BDEPEND="
100	${PYTHON_DEPS}
101	@@ -106,7 +107,7 @@ src_configure() {
102	use inspector \|\| myconf+=( --without-inspector )
103	use npm \|\| myconf+=( --without-npm )
104	use snapshot \|\| myconf+=( --without-node-snapshot )
105	- use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) \|\| myconf+=( --without-ssl )
106	+ use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) \|\| myconf+=( --without-ssl )
107
108	local myarch=""
109	case ${ABI} in
110
111	diff --git a/net-libs/nodejs/nodejs-13.9.0.ebuild b/net-libs/nodejs/nodejs-13.9.0.ebuild
112	index aefd3239857..4d35b088093 100644
113	--- a/net-libs/nodejs/nodejs-13.9.0.ebuild
114	+++ b/net-libs/nodejs/nodejs-13.9.0.ebuild
115	@@ -15,10 +15,11 @@ SRC_URI="
116	LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
117	SLOT="0"
118	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
119	-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
120	+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
121	REQUIRED_USE="
122	inspector? ( icu ssl )
123	npm? ( ssl )
124	+ system-ssl? ( ssl )
125	"
126
127	RDEPEND="
128	@@ -27,7 +28,7 @@ RDEPEND="
129	>=net-libs/nghttp2-1.40.0
130	sys-libs/zlib
131	icu? ( >=dev-libs/icu-64.2:= )
132	- ssl? ( >=dev-libs/openssl-1.1.1:0= )
133	+ system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
134	"
135	BDEPEND="
136	${PYTHON_DEPS}
137	@@ -104,7 +105,7 @@ src_configure() {
138	use inspector \|\| myconf+=( --without-inspector )
139	use npm \|\| myconf+=( --without-npm )
140	use snapshot \|\| myconf+=( --without-node-snapshot )
141	- use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) \|\| myconf+=( --without-ssl )
142	+ use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) \|\| myconf+=( --without-ssl )
143
144	local myarch=""
145	case ${ABI} in
146
147	diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
148	index 00962bc7bcb..71618f3c523 100644
149	--- a/net-libs/nodejs/nodejs-99999999.ebuild
150	+++ b/net-libs/nodejs/nodejs-99999999.ebuild
151	@@ -13,11 +13,12 @@ EGIT_REPO_URI="https://github.com/nodejs/node"
152	LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
153	SLOT="0"
154	KEYWORDS=""
155	-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
156	+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
157	RESTRICT="!test? ( test )"
158	REQUIRED_USE="
159	inspector? ( icu ssl )
160	npm? ( ssl )
161	+ system-ssl? ( ssl )
162	"
163
164	RDEPEND="
165	@@ -26,7 +27,7 @@ RDEPEND="
166	>=net-libs/nghttp2-1.39.2
167	sys-libs/zlib
168	icu? ( >=dev-libs/icu-64.2:= )
169	- ssl? ( >=dev-libs/openssl-1.1.1:0= )
170	+ system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
171	"
172	BDEPEND="
173	${PYTHON_DEPS}
174	@@ -101,7 +102,7 @@ src_configure() {
175	use inspector \|\| myconf+=( --without-inspector )
176	use npm \|\| myconf+=( --without-npm )
177	use snapshot \|\| myconf+=( --without-node-snapshot )
178	- use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) \|\| myconf+=( --without-ssl )
179	+ use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) \|\| myconf+=( --without-ssl )
180
181	local myarch=""
182	case ${ABI} in

Gentoo Archives: gentoo-commits