diff options
Diffstat (limited to 'net-libs/nodejs')
-rw-r--r-- | net-libs/nodejs/Manifest | 26 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-10.19.0.ebuild | 2 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-10.20.0.ebuild (renamed from net-libs/nodejs/nodejs-10.18.0.ebuild) | 17 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-12.16.1.ebuild | 2 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-12.16.2.ebuild (renamed from net-libs/nodejs/nodejs-12.16.0.ebuild) | 13 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-13.10.1.ebuild (renamed from net-libs/nodejs/nodejs-13.9.0.ebuild) | 0 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-13.11.0.ebuild (renamed from net-libs/nodejs/nodejs-13.8.0.ebuild) | 13 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-13.12.0.ebuild (renamed from net-libs/nodejs/nodejs-12.14.0.ebuild) | 37 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-99999999.ebuild | 4 |
9 files changed, 65 insertions, 49 deletions
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 8a7e2bed79df..52a0178eafd5 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -2,21 +2,21 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204 AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c -DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee -DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b -DIST node-v12.16.0.tar.xz 23487084 BLAKE2B 067668ca5af6c35082c3075b4baca256ce656ccf0ac68782a4885bbd2e0ef13108bd72b8b9831ef32f075e4be99fc52b1ce35920cd0db6f10a562a84912cdbd0 SHA512 e0aa45498ffd670052853bae1edfda1a34b291c48232f8a0a58ac329215fb3d0250211ec6dc06fa50fc654e7080028eaf3cc00a3722971a5969054c4cf277f4e +DIST node-v10.20.0.tar.xz 21945800 BLAKE2B af767add881976a648129a999c81bea7e74c2a59ce951cc3cd448e7576782fe8219d67427187a5e5c2bdf684aaddf918bf712ac11f8153cbd511b9d9b7ed3182 SHA512 0472b0d595f8c1dc941612161215e60879dedfe22659878a1c68146c12d92945245135ca951eb84f6c3d16e9a01d084b027903451f7754a7f2028b024c388ebd DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4 -DIST node-v13.8.0.tar.xz 32745596 BLAKE2B 14bf82e8cecde1a4125c7c00c4c9e613c1dbc5bb0241b20f4d30cb8d172612d5a8c362ac786ae516baf9553d5a9c3053414b269fb040cebb664f09096a57985c SHA512 b50d79f029bc04caf193f137b7b3d03f1e1ec9252712015cab2efdeef92bc3176cf7eb36e835cda6221950792e516f9c1894cd2c480e082106e07a11aa1d0761 -DIST node-v13.9.0.tar.xz 32778780 BLAKE2B fb5a0ff82cc1fd255bcc96b50232d6a9e2e3cdab9f5080c6d112b0a5b2dbb952a70d648ccda1b242a7c9e5742683bd320924047bccd1402978d8bbcfa8d1bb68 SHA512 f52184b694bf0dc7755c1c0f05eac400d7e9971e66165a43c7784dfeb935e63de176d3ee937fb09ccb1fc9ac78aec30b6b17e8a477f1b3f10291b1b6d595207c +DIST node-v12.16.2.tar.xz 23654020 BLAKE2B aa4bb764a8731e32ce07d03d96d573632bbf9af79b127c2acec48fcf335c01ea0ea99532670a46befac42e2e1ce5a4dbd2e4cf0d068bac05749d87af59bb80fa SHA512 81688468bc6e20d83f7f58f0c15f9291a801eb2acc8ba7279e65d81f3eb4ea95e3b6cee0d09738c0d0fa35226ae3d52f2bad5da63a20a3edc9129197d42d000d +DIST node-v13.10.1.tar.xz 32812128 BLAKE2B 2dc0e1de269a898f57e9fb91d5b3161d43baa89c8617faffa9998b3244354619a5b78e39500bf02b90fbc2587b8477fbd86850141ec7665690040d6920c50fef SHA512 30b7b58c87021be3e0b909bae476c6191eb72722ed00e51716d7eb0793aeb29c05b088c195ffd69a40dd42423ceba20350f6379c11d276eb3398abfc4cdf340c +DIST node-v13.11.0.tar.xz 32812056 BLAKE2B 0c3975721916f4594515b37b093fb0640785212b455c3687d63a89bb8c6930ce59c74f8ccedab3579d88bedabb881264725d93e43a384b851897bbb94a5a52ac SHA512 cfe8b46d9cf5c7c10f7099bcf1d3a3ec8ac5d70038c6b33009d0815d68e8c1d2a28cd80a16ef1473eba3927360903bcf6a74e8d5f71f09b5ff7919d908545211 +DIST node-v13.12.0.tar.xz 32841080 BLAKE2B 64687e8d5b768f4571b53542bcf5d023953069eba5fdfb746a8dd29e4542141a9b57fc0524429cde9a3c2e579dd47128e06d46d1f3ae1a35326f8b69a750118f SHA512 3166da61a3d84fa9d4cbfc473df7441a6f7e648ad92b095cc357c2440214ddde117fb220270db8e0736eea3b715742f0d73666bba25724770e7e8f6071495d57 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42 -EBUILD nodejs-10.18.0.ebuild 6282 BLAKE2B 672b04c2a80abf23317a1e94c29c66f462167d805fc86afb0a29aaae49afe50f7a7c6e6141ca2449fc935a42fb671925e7a0aa9910a37b2ce61b7938b266bfac SHA512 feacefcf26854f4ece1abcb5070dbaf7c6a33be097e6dc45ee599b575c884b96415c1158f207e7dff948738a96b09ee096f1a100dacadcbc16db3f28165241f2 -EBUILD nodejs-10.19.0.ebuild 6361 BLAKE2B 33e4a0e7936b81216945e5bce90f8d85858489800f140ce5203b79e217515be71e0c89b4cb7d64119fc416eb0aba5f516a70a197ed8e14acb76b5c470d3b4a11 SHA512 9420657f220cd01ad9efa2926a1d081d3ce35580fd15d3f7e37bf0a5d1e77039b97e51db107a3eb63d4b494bd1e62067e91fec962f525133211f4731fc07860c -EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B def68b17c74f2dca48588c0e45bd7c52f33ed8fbc04dd65189a044333e6188f64a286e563b7e2d6c9736f3f8e37252a96883c07d8e860bd0e41e82c97f464b3c SHA512 4fb47c678f94f82a4fde66b944cd56a17bcb6fe32d112a852b28739ec43d529aab0b2e8fb9e21a011709f7e42d62f140d900cfee8c39e7b7a3d08b9004a1434d -EBUILD nodejs-12.16.0.ebuild 6128 BLAKE2B 327de2b84bccd5ab4096554e7bf395db5d876a06a0d96b790e66b889fe775d942bcd87ec6253c3a3dfabe844249038d02785f0df6cd6f44cef2ef35c1681a43b SHA512 204d876ef7ef3f8a5b8573d3b2731651a72edc3e8e525ddb9603e9c3089d86e8fcf0c2edc701473aef488f412c2dc735f21d5549df96aa06c71f578e8ef01f2e -EBUILD nodejs-12.16.1.ebuild 6203 BLAKE2B 6812d02a4be07368513881c86ada628038ed9f8a500c31d2402e68f98a10565ce9357fa223b6cc2be7d52fca3e79faed8e9ed78a62ac0e70f9b0860d9d50b528 SHA512 e11a467840822bc9cb6045f8af166088998a45b7834bda6f444fac64aaf44168fc2012138768ddc4f502098df2023143140834381d381fb64fac6c423573cdc1 -EBUILD nodejs-13.8.0.ebuild 6149 BLAKE2B 9add0c1858c32bf245bd3d687b98af5d11aab6fa09cb8627a4352bc91244c498e19ee137f0e6c5b1a8f16423cd447bdffb59bf19ec047ed29973c837d06a8295 SHA512 cb79f90013b8bcc42e78aeb85038f3f438452ef886b5a3fd1722ecf9d241fa9c94453e1f9e6c8a82ac324615fd9a4d935e8e36d2d6b24fed2d4edb62488937d5 -EBUILD nodejs-13.9.0.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62 +EBUILD nodejs-10.19.0.ebuild 6357 BLAKE2B b44a9661af496c8ba80b1ee680b2c511b3b6c2f7702d23710ff2876312e1f20016e579a36531083699a9881001e65150565c3b1fe6f5875b667aa9b79e87a665 SHA512 b290ea8a99c36e16fc0dcae001a3466a094c7ab6953c04f04a86ee0cef14b8ba861e86ad44e0a2b882636b16e95de6975afe40bb5d5e090791322bad6c276b8c +EBUILD nodejs-10.20.0.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e +EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c +EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53 +EBUILD nodejs-13.10.1.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62 +EBUILD nodejs-13.11.0.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62 +EBUILD nodejs-13.12.0.ebuild 6224 BLAKE2B 255424238dfffc7fbc372c553c2d4999bcb2ecb03ade1d0afd519b9b7bcb81b1029512167271bbd79dc901b4f2c8a19f44c7ed01412071b29063daafd3fd981f SHA512 4e06fe7a67ec3b98cd8f1f4f2be14c38401234f0aab81ff7447b7193f7aa663fc94bec24351c05d517b889d84c2880bd2b0746e1a7374676e70e1b46e9a707be EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c -EBUILD nodejs-99999999.ebuild 6140 BLAKE2B 94dbffe5d736060ca34f8dba48792340e4c80880aa993e01b8b4e5efa5a126596f3a982947f0eba1fd98a3fef5bf73837d67904a64d9449ffea517ebeb1a361a SHA512 7e7318a663fa3e3e37bd75cdc3e75356ec986e352254bf964f70cc8bdea3d7ea381b4c2456044b1eed335aeb3966f527bfdf24aef2fd2d633e6118544c8c08a3 +EBUILD nodejs-99999999.ebuild 6140 BLAKE2B 3aee0007d3eb0fe6705452a9ef8c99437a11466afbe8669cf720d88788057b52d5e023c363bc185de34d3e882204e524429f39e94d644a3eaf76195bbc406b98 SHA512 ab3643572c01ac72fe0fd493b2a1fab6f10dabe9f169ffa4842c491cec0cac4f11fa2aea0ea575b23073628a74e5e902cb100517286df002d67b536358a35f0e MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87 diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild index 1aedca2b28c8..409bd25dff50 100644 --- a/net-libs/nodejs/nodejs-10.19.0.ebuild +++ b/net-libs/nodejs/nodejs-10.19.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/nodejs/nodejs-10.18.0.ebuild b/net-libs/nodejs/nodejs-10.20.0.ebuild index 08ff17e9980f..1f645e5535ca 100644 --- a/net-libs/nodejs/nodejs-10.18.0.ebuild +++ b/net-libs/nodejs/nodejs-10.20.0.ebuild @@ -12,21 +12,22 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" 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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" - >=dev-libs/libuv-1.28.0:= + >=dev-libs/libuv-1.34.2:= >=net-dns/c-ares-1.15.0 - >=net-libs/http-parser-2.9.0:= + >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " DEPEND=" ${RDEPEND} @@ -99,7 +100,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot && myconf+=( --with-snapshot ) - use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl ) + else + myconf+=( --without-ssl ) + fi local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild index d0e7e0c5b4cf..29723942409f 100644 --- a/net-libs/nodejs/nodejs-12.16.1.ebuild +++ b/net-libs/nodejs/nodejs-12.16.1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/nodejs/nodejs-12.16.0.ebuild b/net-libs/nodejs/nodejs-12.16.2.ebuild index 3850f958b73f..0be68355a99b 100644 --- a/net-libs/nodejs/nodejs-12.16.0.ebuild +++ b/net-libs/nodejs/nodejs-12.16.2.ebuild @@ -15,20 +15,21 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" 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" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" - >=dev-libs/libuv-1.34.0:= + >=dev-libs/libuv-1.34.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} @@ -106,7 +107,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-13.9.0.ebuild b/net-libs/nodejs/nodejs-13.10.1.ebuild index 00513e8978c4..00513e8978c4 100644 --- a/net-libs/nodejs/nodejs-13.9.0.ebuild +++ b/net-libs/nodejs/nodejs-13.10.1.ebuild diff --git a/net-libs/nodejs/nodejs-13.8.0.ebuild b/net-libs/nodejs/nodejs-13.11.0.ebuild index 157d3993d84d..00513e8978c4 100644 --- a/net-libs/nodejs/nodejs-13.8.0.ebuild +++ b/net-libs/nodejs/nodejs-13.11.0.ebuild @@ -15,19 +15,20 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" - >=dev-libs/libuv-1.34.1:= + >=dev-libs/libuv-1.34.2:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} @@ -104,7 +105,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-12.14.0.ebuild b/net-libs/nodejs/nodejs-13.12.0.ebuild index 3cd8d0e32cb9..3bd32e160d50 100644 --- a/net-libs/nodejs/nodejs-12.14.0.ebuild +++ b/net-libs/nodejs/nodejs-13.12.0.ebuild @@ -14,33 +14,33 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" 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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" - >=dev-libs/libuv-1.33.1:= + >=dev-libs/libuv-1.35.0:= >=net-dns/c-ares-1.15.0 - >=net-libs/http-parser-2.9.0:= - >=net-libs/nghttp2-1.39.2 + >=net-libs/nghttp2-1.40.0 sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + icu? ( >=dev-libs/icu-66.1:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) + pax_kernel? ( sys-apps/elfix ) " DEPEND=" ${RDEPEND} " PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-99999999-llhttp.patch ) RESTRICT="test" S="${WORKDIR}/node-v${PV}" @@ -88,6 +88,9 @@ src_prepare() { BUILDTYPE=Debug fi + # We need to disable mprotect on two files when it builds Bug 694100. + use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) + default } @@ -95,18 +98,18 @@ src_configure() { xdg_environment_reset local myconf=( - --shared-cares - --shared-http-parser - --shared-libuv - --shared-nghttp2 - --shared-zlib + --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib ) use debug && myconf+=( --debug ) use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) - use snapshot && myconf+=( --with-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi local myarch="" case ${ABI} in @@ -130,8 +133,6 @@ src_configure() { } src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" emake -C out } @@ -195,7 +196,7 @@ src_install() { src_test() { out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die } pkg_postinst() { diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 7a8dc689fddd..f2c3b912ddaf 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -22,11 +22,11 @@ REQUIRED_USE=" " RDEPEND=" - >=dev-libs/libuv-1.34.1:= + >=dev-libs/libuv-1.35.0:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) + icu? ( >=dev-libs/icu-66.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" |