1 |
commit: 84117a49ca5c6fddb9ccae3d05a0478b86600a3e |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 30 06:18:39 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 30 06:26:46 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84117a49 |
7 |
|
8 |
net-libs/nodejs: Use app-arch/brotli |
9 |
|
10 |
Closes: https://bugs.gentoo.org/679590 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
RepoMan-Options: --force |
13 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
14 |
|
15 |
.../nodejs/{nodejs-12.18.4.ebuild => nodejs-12.18.4-r1.ebuild} | 2 ++ |
16 |
.../nodejs/{nodejs-14.13.0.ebuild => nodejs-14.13.0-r1.ebuild} | 7 ++++++- |
17 |
net-libs/nodejs/nodejs-99999999.ebuild | 7 ++++++- |
18 |
3 files changed, 14 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/net-libs/nodejs/nodejs-12.18.4.ebuild b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild |
21 |
similarity index 99% |
22 |
rename from net-libs/nodejs/nodejs-12.18.4.ebuild |
23 |
rename to net-libs/nodejs/nodejs-12.18.4-r1.ebuild |
24 |
index eb3c992aa2b..db33bcfb87c 100644 |
25 |
--- a/net-libs/nodejs/nodejs-12.18.4.ebuild |
26 |
+++ b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild |
27 |
@@ -23,6 +23,7 @@ REQUIRED_USE=" |
28 |
" |
29 |
|
30 |
RDEPEND=" |
31 |
+ >=app-arch/brotli-1.0.7 |
32 |
>=dev-libs/libuv-1.39.0:= |
33 |
>=net-dns/c-ares-1.16.0 |
34 |
>=net-libs/http-parser-2.9.3:= |
35 |
@@ -96,6 +97,7 @@ src_configure() { |
36 |
xdg_environment_reset |
37 |
|
38 |
local myconf=( |
39 |
+ --shared-brotli |
40 |
--shared-cares |
41 |
--shared-http-parser |
42 |
--shared-libuv |
43 |
|
44 |
diff --git a/net-libs/nodejs/nodejs-14.13.0.ebuild b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild |
45 |
similarity index 98% |
46 |
rename from net-libs/nodejs/nodejs-14.13.0.ebuild |
47 |
rename to net-libs/nodejs/nodejs-14.13.0-r1.ebuild |
48 |
index 0e7ae978962..1b229989974 100644 |
49 |
--- a/net-libs/nodejs/nodejs-14.13.0.ebuild |
50 |
+++ b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild |
51 |
@@ -23,6 +23,7 @@ REQUIRED_USE=" |
52 |
" |
53 |
|
54 |
RDEPEND=" |
55 |
+ >=app-arch/brotli-1.0.9 |
56 |
>=dev-libs/libuv-1.40.0:= |
57 |
>=net-dns/c-ares-1.16.1 |
58 |
>=net-libs/nghttp2-1.41.0 |
59 |
@@ -98,7 +99,11 @@ src_configure() { |
60 |
xdg_environment_reset |
61 |
|
62 |
local myconf=( |
63 |
- --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib |
64 |
+ --shared-brotli |
65 |
+ --shared-cares |
66 |
+ --shared-libuv |
67 |
+ --shared-nghttp2 |
68 |
+ --shared-zlib |
69 |
) |
70 |
use debug && myconf+=( --debug ) |
71 |
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) |
72 |
|
73 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild |
74 |
index 592f3a25366..87f5c52bddd 100644 |
75 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
76 |
+++ b/net-libs/nodejs/nodejs-99999999.ebuild |
77 |
@@ -22,6 +22,7 @@ REQUIRED_USE=" |
78 |
" |
79 |
|
80 |
RDEPEND=" |
81 |
+ >=app-arch/brotli-1.0.9 |
82 |
>=dev-libs/libuv-1.40.0:= |
83 |
>=net-dns/c-ares-1.16.1 |
84 |
>=net-libs/nghttp2-1.41.0 |
85 |
@@ -95,7 +96,11 @@ src_configure() { |
86 |
xdg_environment_reset |
87 |
|
88 |
local myconf=( |
89 |
- --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib |
90 |
+ --shared-brotli |
91 |
+ --shared-cares |
92 |
+ --shared-libuv |
93 |
+ --shared-nghttp2 |
94 |
+ --shared-zlib |
95 |
) |
96 |
use debug && myconf+=( --debug ) |
97 |
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) |