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

From:	Jeroen Roovers <jer@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/
Date:	Wed, 21 Nov 2018 16:06:27
Message-Id:	`1542816375.7aff0f0339d3bdeb6fc22975d54f960a62be7528.jer@gentoo`

1

commit:     7aff0f0339d3bdeb6fc22975d54f960a62be7528

2

Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

3

AuthorDate: Wed Nov 21 15:41:26 2018 +0000

4

Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

5

CommitDate: Wed Nov 21 16:06:15 2018 +0000

6

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

7

8

net-libs/nodejs: Revert dev-libs/openssl-1.1* dep change

9

10

With openssl-1.1.1a I see lots and lots of test failures that I do not see with

11

1.1.0* -- these reflect actual errors in using crypto functions.

12

13

While there, resolve an implicit dependency on net-dns/c-ares that was

14

missed in the 8, 9, 10 and 11 branch version bumps.

15

16

Fixes: 64bc534bf4412e0088839c628ff79fa456ae60bb

17

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

18

Package-Manager: Portage-2.3.52, Repoman-2.3.12

19

Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

20

21

 net-libs/nodejs/nodejs-10.13.0.ebuild  | 2 +-

22

 net-libs/nodejs/nodejs-11.2.0.ebuild   | 5 +++--

23

 net-libs/nodejs/nodejs-8.13.0.ebuild   | 3 ++-

24

 net-libs/nodejs/nodejs-9.11.2.ebuild   | 3 ++-

25

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

26

 5 files changed, 10 insertions(+), 6 deletions(-)

27

28

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

29

index 48b92009eac..ea37a260ff5 100644

30

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

31

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

32

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

33

 	>=net-libs/nghttp2-1.34.0

34

 	sys-libs/zlib

35

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

36

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

37

+	ssl? ( =dev-libs/openssl-1.1.0*:0= )

38

"

39

 DEPEND="

40

 	${RDEPEND}

41

42

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

43

index 460e9934c1c..0f0eca94f04 100644

44

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

45

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

46

@@ -24,11 +24,12 @@ REQUIRED_USE="

47

48

 RDEPEND="

49

 	>=dev-libs/libuv-1.23.2:=

50

+	>=net-dns/c-ares-1.15.0

51

 	>=net-libs/http-parser-2.8.0:=

52

 	>=net-libs/nghttp2-1.34.0

53

 	sys-libs/zlib

54

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

55

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

56

+	ssl? ( =dev-libs/openssl-1.1.0*:0= )

57

"

58

 DEPEND="

59

 	${RDEPEND}

60

@@ -92,7 +93,7 @@ src_prepare() {

61

}

62

63

 src_configure() {

64

-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

65

+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

66

 	use debug && myconf+=( --debug )

67

 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )

68

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

69

70

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

71

index 83633326efc..9c86a46c7a6 100644

72

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

73

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

74

@@ -25,6 +25,7 @@ REQUIRED_USE="

75

76

 RDEPEND="

77

 	>=dev-libs/libuv-1.23.2:=

78

+	>=net-dns/c-ares-1.10.1

79

 	>=net-libs/http-parser-2.8.0:=

80

 	>=net-libs/nghttp2-1.33.0

81

 	sys-libs/zlib

82

@@ -97,7 +98,7 @@ src_prepare() {

83

}

84

85

 src_configure() {

86

-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

87

+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

88

 	use debug && myconf+=( --debug )

89

 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )

90

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

91

92

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

93

index 449755ba98b..c38803a05be 100644

94

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

95

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

96

@@ -24,6 +24,7 @@ REQUIRED_USE="

97

98

 RDEPEND="

99

 	>=dev-libs/libuv-1.19.2:=

100

+	>=net-dns/c-ares-1.13.0

101

 	>=net-libs/http-parser-2.8.0:=

102

 	>=net-libs/nghttp2-1.32.0

103

 	sys-libs/zlib

104

@@ -92,7 +93,7 @@ src_prepare() {

105

}

106

107

 src_configure() {

108

-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

109

+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

110

 	use debug && myconf+=( --debug )

111

 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )

112

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

113

114

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

115

index ed175f32b8c..50cfd8981c8 100644

116

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

117

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

118

@@ -23,6 +23,7 @@ REQUIRED_USE="

119

120

 RDEPEND="

121

 	>=dev-libs/libuv-1.19.2:=

122

+	>=net-dns/c-ares-1.15.0

123

 	>=net-libs/http-parser-2.8.0:=

124

 	>=net-libs/nghttp2-1.29.0

125

 	sys-libs/zlib

126

@@ -91,7 +92,7 @@ src_prepare() {

127

}

128

129

 src_configure() {

130

-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

131

+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )

132

 	use debug && myconf+=( --debug )

133

 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )

134

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

1	commit: 7aff0f0339d3bdeb6fc22975d54f960a62be7528
2	Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3	AuthorDate: Wed Nov 21 15:41:26 2018 +0000
4	Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5	CommitDate: Wed Nov 21 16:06:15 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aff0f03
7
8	net-libs/nodejs: Revert dev-libs/openssl-1.1* dep change
9
10	With openssl-1.1.1a I see lots and lots of test failures that I do not see with
11	1.1.0* -- these reflect actual errors in using crypto functions.
12
13	While there, resolve an implicit dependency on net-dns/c-ares that was
14	missed in the 8, 9, 10 and 11 branch version bumps.
15
16	Fixes: 64bc534bf4412e0088839c628ff79fa456ae60bb
17	Bug: https://bugs.gentoo.org/670574
18	Package-Manager: Portage-2.3.52, Repoman-2.3.12
19	Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
20
21	net-libs/nodejs/nodejs-10.13.0.ebuild \| 2 +-
22	net-libs/nodejs/nodejs-11.2.0.ebuild \| 5 +++--
23	net-libs/nodejs/nodejs-8.13.0.ebuild \| 3 ++-
24	net-libs/nodejs/nodejs-9.11.2.ebuild \| 3 ++-
25	net-libs/nodejs/nodejs-99999999.ebuild \| 3 ++-
26	5 files changed, 10 insertions(+), 6 deletions(-)
27
28	diff --git a/net-libs/nodejs/nodejs-10.13.0.ebuild b/net-libs/nodejs/nodejs-10.13.0.ebuild
29	index 48b92009eac..ea37a260ff5 100644
30	--- a/net-libs/nodejs/nodejs-10.13.0.ebuild
31	+++ b/net-libs/nodejs/nodejs-10.13.0.ebuild
32	@@ -29,7 +29,7 @@ RDEPEND="
33	>=net-libs/nghttp2-1.34.0
34	sys-libs/zlib
35	icu? ( >=dev-libs/icu-62.1:= )
36	- ssl? ( >=dev-libs/openssl-1.1:0= )
37	+ ssl? ( =dev-libs/openssl-1.1.0*:0= )
38	"
39	DEPEND="
40	${RDEPEND}
41
42	diff --git a/net-libs/nodejs/nodejs-11.2.0.ebuild b/net-libs/nodejs/nodejs-11.2.0.ebuild
43	index 460e9934c1c..0f0eca94f04 100644
44	--- a/net-libs/nodejs/nodejs-11.2.0.ebuild
45	+++ b/net-libs/nodejs/nodejs-11.2.0.ebuild
46	@@ -24,11 +24,12 @@ REQUIRED_USE="
47
48	RDEPEND="
49	>=dev-libs/libuv-1.23.2:=
50	+ >=net-dns/c-ares-1.15.0
51	>=net-libs/http-parser-2.8.0:=
52	>=net-libs/nghttp2-1.34.0
53	sys-libs/zlib
54	icu? ( >=dev-libs/icu-63.1:= )
55	- ssl? ( >=dev-libs/openssl-1.1:0= )
56	+ ssl? ( =dev-libs/openssl-1.1.0*:0= )
57	"
58	DEPEND="
59	${RDEPEND}
60	@@ -92,7 +93,7 @@ src_prepare() {
61	}
62
63	src_configure() {
64	- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
65	+ local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
66	use debug && myconf+=( --debug )
67	use icu && myconf+=( --with-intl=system-icu ) \|\| myconf+=( --with-intl=none )
68	use inspector \|\| myconf+=( --without-inspector )
69
70	diff --git a/net-libs/nodejs/nodejs-8.13.0.ebuild b/net-libs/nodejs/nodejs-8.13.0.ebuild
71	index 83633326efc..9c86a46c7a6 100644
72	--- a/net-libs/nodejs/nodejs-8.13.0.ebuild
73	+++ b/net-libs/nodejs/nodejs-8.13.0.ebuild
74	@@ -25,6 +25,7 @@ REQUIRED_USE="
75
76	RDEPEND="
77	>=dev-libs/libuv-1.23.2:=
78	+ >=net-dns/c-ares-1.10.1
79	>=net-libs/http-parser-2.8.0:=
80	>=net-libs/nghttp2-1.33.0
81	sys-libs/zlib
82	@@ -97,7 +98,7 @@ src_prepare() {
83	}
84
85	src_configure() {
86	- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
87	+ local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
88	use debug && myconf+=( --debug )
89	use icu && myconf+=( --with-intl=system-icu ) \|\| myconf+=( --with-intl=none )
90	use inspector \|\| myconf+=( --without-inspector )
91
92	diff --git a/net-libs/nodejs/nodejs-9.11.2.ebuild b/net-libs/nodejs/nodejs-9.11.2.ebuild
93	index 449755ba98b..c38803a05be 100644
94	--- a/net-libs/nodejs/nodejs-9.11.2.ebuild
95	+++ b/net-libs/nodejs/nodejs-9.11.2.ebuild
96	@@ -24,6 +24,7 @@ REQUIRED_USE="
97
98	RDEPEND="
99	>=dev-libs/libuv-1.19.2:=
100	+ >=net-dns/c-ares-1.13.0
101	>=net-libs/http-parser-2.8.0:=
102	>=net-libs/nghttp2-1.32.0
103	sys-libs/zlib
104	@@ -92,7 +93,7 @@ src_prepare() {
105	}
106
107	src_configure() {
108	- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
109	+ local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
110	use debug && myconf+=( --debug )
111	use icu && myconf+=( --with-intl=system-icu ) \|\| myconf+=( --with-intl=none )
112	use inspector \|\| myconf+=( --without-inspector )
113
114	diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
115	index ed175f32b8c..50cfd8981c8 100644
116	--- a/net-libs/nodejs/nodejs-99999999.ebuild
117	+++ b/net-libs/nodejs/nodejs-99999999.ebuild
118	@@ -23,6 +23,7 @@ REQUIRED_USE="
119
120	RDEPEND="
121	>=dev-libs/libuv-1.19.2:=
122	+ >=net-dns/c-ares-1.15.0
123	>=net-libs/http-parser-2.8.0:=
124	>=net-libs/nghttp2-1.29.0
125	sys-libs/zlib
126	@@ -91,7 +92,7 @@ src_prepare() {
127	}
128
129	src_configure() {
130	- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
131	+ local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
132	use debug && myconf+=( --debug )
133	use icu && myconf+=( --with-intl=system-icu ) \|\| myconf+=( --with-intl=none )
134	use inspector \|\| myconf+=( --without-inspector )

Gentoo Archives: gentoo-commits