diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-05 17:31:39 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-05 17:31:39 +0100 |
commit | 8b5a92f1e1eccecfa61db8a4744e1b9d449522b6 (patch) | |
tree | 427b7c54371dc36d63e7fa3590ec577ad265eac9 /net-libs | |
parent | 3023707d355581e5dc6945aa9c8f4d59e508a8b5 (diff) |
gentoo auto-resync : 05:05:2023 - 17:31:39
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/Manifest.gz | bin | 32462 -> 32467 bytes | |||
-rw-r--r-- | net-libs/libpsl/Manifest | 3 | ||||
-rw-r--r-- | net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch | 39 | ||||
-rw-r--r-- | net-libs/libpsl/libpsl-0.21.2.ebuild | 13 | ||||
-rw-r--r-- | net-libs/nodejs/Manifest | 8 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch | 111 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch | 33 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch | 20 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-gcc-13.patch | 27 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-14.21.3.ebuild | 240 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-20.0.0.ebuild | 254 |
11 files changed, 51 insertions, 697 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 95098b8198c2..20034275ee26 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest index f5c9e08163fb..f0c977b6fcea 100644 --- a/net-libs/libpsl/Manifest +++ b/net-libs/libpsl/Manifest @@ -1,5 +1,6 @@ +AUX libpsl-0.21.2-tests-optional.patch 1141 BLAKE2B a72459d3e735391222d0a4e2fb7e42eccdd07a0c2ef05c381b49f3a967df797d3da225fcb5cb6d98ad8a14eb460589e60f7f16d338171c7b081741d5382b09ed SHA512 1b3fee48b1f5c85f58f704e3447e831b1a0b17a07b7f1e9456e8fde54ece4222be79c3f11811bfc5c601317b5a4b18ac7c358e5d438a08c6452b4ccdbd53b2aa DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5 DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d EBUILD libpsl-0.21.1-r1.ebuild 1586 BLAKE2B 3d841d84d4286bba718b89be473b1735604600248e2e7b62a521b6737074c4141b2252918b7aea91af4f5aec6d0ae9d61b568acb5a416e1ff2db4f2a92ca034f SHA512 690f17d27b96c1c66bb94917c8d71c0884f79e5e6b75f36912a5b56f3ae4420ab754dbe52e82a04fa40fa9132aa755764278078ba0a9e6293fc0323c24556daf -EBUILD libpsl-0.21.2.ebuild 1196 BLAKE2B c1c93ce6d89b3436019da1279a2232ba2ca488ed40622d182e0aaf52e3a9d10ecbd5e7255d7974c36e4f9e9cb95e8ab79f2613cdf65584092387e237ad261262 SHA512 9d428de4fb598a4b687d66424fab2a6ab5fc9d4165007bd7921c740d0690ab6de35629d9c0df89208fbd22a978dfd78dd4eab8b72d62a608d24e6a2e3a16aba3 +EBUILD libpsl-0.21.2.ebuild 1311 BLAKE2B b5f9fb3476567bad769fb93ec34e0acc6ad46abff57b51caf28323c8a671277758f5551d4387ca511ca99ae0e6470cf3084fa4312a5240f82a9353970500fe0b SHA512 50c828251a50b878458cbe9616356bf2c1bfab4f41f7383c11a91d4e0a05754b916670a25dcf07e02961d28a92ccd4e020df3233947d17c575cec1da7656ddff MISC metadata.xml 255 BLAKE2B 36ae66735664b8ed69846146d268e59f89bbea0d01d46f692709b9bfc521f70875a331b0995442435566e1896d9090bc9d9a6b9a63bf5de51b55d9a095f60d7a SHA512 4ce190fd174d39c74bce7eec22d651f9f15248ebbb7a2ffb68f7c9bae01ed412b6652285fcbb055770896d8ea0a1241c3aea30c2a0f4c223aba3b1dd723f1b9e diff --git a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch new file mode 100644 index 000000000000..0f5773d75739 --- /dev/null +++ b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch @@ -0,0 +1,39 @@ +https://github.com/rockdaboot/libpsl/commit/fb6b75317ab669c255906fa4db256837332eb1ed + +From fb6b75317ab669c255906fa4db256837332eb1ed Mon Sep 17 00:00:00 2001 +From: Vincent Torri <vtorri@outlook.fr> +Date: Sat, 14 Jan 2023 17:25:31 +0100 +Subject: [PATCH] add 'tests' option to disable tests and fuzzers + +--- + meson.build | 6 ++++-- + meson_options.txt | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d96748d..4492354 100644 +--- a/meson.build ++++ b/meson.build +@@ -132,6 +132,8 @@ endif + subdir('include') + subdir('src') + subdir('tools') +-subdir('tests') +-subdir('fuzz') ++if get_option('tests') ++ subdir('tests') ++ subdir('fuzz') ++endif + subdir(join_paths('docs', 'libpsl')) +diff --git a/meson_options.txt b/meson_options.txt +index e9d6a23..d66f256 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,3 +17,6 @@ option('psl_testfile', type : 'string', value : '', + + option('docs', type: 'boolean', value: false, + description: 'Build the API reference (requires gtk-doc)') ++ ++option('tests', type: 'boolean', value: true, ++ description: 'Build the tests and fuzzers') + diff --git a/net-libs/libpsl/libpsl-0.21.2.ebuild b/net-libs/libpsl/libpsl-0.21.2.ebuild index 221ce7a987cc..8dba8ae8ee92 100644 --- a/net-libs/libpsl/libpsl-0.21.2.ebuild +++ b/net-libs/libpsl/libpsl-0.21.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit meson-multilib python-any-r1 DESCRIPTION="C library for the Public Suffix List" @@ -13,7 +13,8 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="icu +idn" +IUSE="icu +idn test" +RESTRICT="!test? ( test )" RDEPEND=" icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) @@ -29,6 +30,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch +) + pkg_pretend() { if use icu && use idn ; then ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"." @@ -36,7 +41,9 @@ pkg_pretend() { } multilib_src_configure() { - local emesonargs=() + local emesonargs=( + $(meson_use test tests) + ) # Prefer idn even if icu is in USE as well if use idn ; then diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index db2946bfc0f1..0954591a085e 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,19 +1,11 @@ -AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23 -AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396 -AUX nodejs-14.19.0-global-npm-config.patch 914 BLAKE2B 015fd323cbdb3548f4858f98853bb17608a69a26187cefb8747c4873c00d9dc85fe5388ff7b646a260d5bbc28be393f14d71620612200dd0d98a2ccbc1a8f20a SHA512 91e7b62498a19de1f7e71a31bc83e83642376d74df23af922d85d7cdfcb1a3bee9db1f0c345a53ae5d6074b0673a3945a1d95165128893faa0b5124b52a19af2 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3 AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9 AUX nodejs-fix-incomplete-type.patch 1895 BLAKE2B 30b548caee43f47dd25d35b789257b6355cf9ef4adde15c533fc6ea23650cd44d5dd555474248e39a8e6f782215847ec42595710349875c0817f60eae026873e SHA512 e97479bd7a3f6d3557609e5db2eab1f426a64fcc0ac1c3b204a93a0dd86ec4764040079e2dc14f84c9e69fdc2e18af2f9fe6e0c008d381eae9ce2da6616a25ba -AUX nodejs-gcc-13.patch 841 BLAKE2B 86150b503987c2c84acfc2967883cd81109cb3117eb8d647c8682cad7ba04e2248b1465acdb188f083bc246e165be336c153ff850236fccf6de8d04115a3577b SHA512 2d8f6c132c2e7a9c9acbf46ad4f7687c3bc0d1382b1966eaf9a4bd30d5eb0e6513c2fe32c73e9ed2bc8ae4cf3ebfcca29251b71e4589df0f898e11f1242fd936 -DIST node-v14.21.3.tar.xz 34508116 BLAKE2B 6fa001be10499ff2dfc920690dda9df25423f3e5c0bf19ae2ab9df571ca905e164e5a4eb778d0aa16a6026c354e39e063bde39d734a0532c3d95c937e509a9cb SHA512 bea8ccbb95ba00c220a42d30f8827fc94fb63725079dc3b63c65fd62d5f4f85d1d78e00b9b1f882a80449fa251930d3f3f5f9c8ae8d14d132660d4c4fd0b08f0 DIST node-v16.20.0.tar.xz 35546884 BLAKE2B 5bdb1fb7365e07f13d0a58a8d052d11efaadcf1b0792af0517b78b1ecf01e50eabe26e31588ae410ee63b7494a4eb9d23f70d4dd157a452d0bbf8bd548865255 SHA512 b155acdff0244307afcc334844f113b5c321f7764ebb69326d60a6a79d0e0d38d55257a38b815f5933aa4071e6a788e01c466476ef012cec648c84d74adda406 DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9031b3332939330ba5a3edb5bc2ed6dc21bf861509696e19ed0cc5d5c54bb882018f0e54eb1ad8e9b0ba3bb64bff SHA512 608ce5db97ce2d851f381c7991f635c5e0927ae79037649b482c7e197479341b7c6560644e25f4d65ece8aa80c5763a0e044349a5be210fa33fbbf97a96462bd -DIST node-v20.0.0.tar.xz 41279796 BLAKE2B 1df8785ca22dea15c6c1f19ec2d3b3d704f9cda6cf13d6e8e8fbbf853515871f18a11a4bbe5ed765434f6f5606975c5254e1826f2e506165ff937ef16d326262 SHA512 cda981227398c1a9023a2212c0d5351eadfedd19d58776dcc470e3ba0213a178b626c37d48fa52548ddd5a70d26a18b66c266856321a0af9ada2b1eac7ee9fd8 DIST node-v20.1.0.tar.xz 41501496 BLAKE2B 03731915e734f0fd5cfb94fd05f4bd88ca015c5d5a91666d091499daa1a1b3193a3b4667ccec99ce1442ef6b402838705c42e785275dd327bf72adaae9487f50 SHA512 06b88a3ab3f1c089f0d38fb504083bed9a2d27b1b07633dbd40b02bcb3c0a22f6d04ab70abc394fdfb14ac978e974d97656bffeb27e0e47b0c95e672b925067c -EBUILD nodejs-14.21.3.ebuild 7089 BLAKE2B 5a039629b268d5b88ecb324d1a39415c9ebd810264aaae3c699a8a28333d2330fa904d7ba6295f53db6beb8941f7568415d5af576c7c289a2837f7f53596a4c2 SHA512 c51e35fd2936f3397e14dfab0aea7ac0db20734f4358d2cf804bfaa3173683ed58e47feb71f1c647467e1f69a1be5cf88893899263af0192c9613038c3ae55e1 EBUILD nodejs-16.20.0.ebuild 6528 BLAKE2B b82dcfd7a92a82a581fafb9e02e3690523aaf939032727d5f96b0e1f16c450e1eda2d5f9397c4d7a8d2c0d7cf4a31333f3bbd0a4831a5e631b7e89b85290605d SHA512 a2352ef380bb83582e8852e7245e599971fab5e3cd13a66c1e9f43018d43e31a128b6e6ac1a2b7db3aa03c6c27a65caa5c80b62605602c308c9dd1b572c6d6d1 EBUILD nodejs-18.16.0.ebuild 7339 BLAKE2B 3e302299fd5da5dac7adca2ec0ee315cf9eb19dfd1c1385b54e00ce15fefdd345f6240d933abb14852ac7dd5f2c319137db368b44f9419685b8ee9c49f0f1619 SHA512 405eda8e1e52d0ed09f415eba79da91b46b66e6de882267dc8cbf8eb4a65fd94d5e838a9fd47fe9a14a5c74db078b94c46bc698bd924f507f020f6a7536594ba -EBUILD nodejs-20.0.0.ebuild 7275 BLAKE2B cf845e10bda6b1b0e51cee80d31bd88b96b4288acd04ec29e0b8c4ddbad0627ae6bd4dc2146eff3be6c7c0f6f016c9b7240fb4ad992bb069281ad31564ff2d8a SHA512 9726f7a3c93f9a9db42e0478d9fb30532b236296f2818b55aa449e15abf7f0276922deee46da95f7e86fd489d2de7ab7de23e5a17c5acb06781b775ef8bf9592 EBUILD nodejs-20.1.0.ebuild 7266 BLAKE2B 67f8cc61e1bd863a12cd8f54e2342390d17a6a538dd55268483968cc4c80ac02af892c6816162026dd42d626817a3318615b038229fa6ef286ac1c79ccb87967 SHA512 f374449c601f3df6b6821c3b64a42e305b982fd95bdee4abb13bf9597c58a058822b170c505f3df763cb4df3e7200959f08c3deb548acaeaefb105680a7a67c4 EBUILD nodejs-99999999.ebuild 7215 BLAKE2B 979eb0315c6acd1c93842d09752ac793d5386197c67991158f52918620ac0b7ac3e98a3e8cd087918a43bdd94251f5851bcc8cb7757dda08193e912748c9bd34 SHA512 9f804d7707910731176e2f04850af52092158a9d732cc5e82df278d5323536ca86bc401dd3527886f08c19821ddc2c76e446ccb05b7352b07460b8003529d08e MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97 diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch deleted file mode 100644 index 8dbf5f43d486..000000000000 --- a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch +++ /dev/null @@ -1,111 +0,0 @@ - Bug: 694100 - Add actions for pax marking mkcodecache, node_mksnapshot and mksnapshot - to disable mprotect for pax enable kernel. - Reported-by: Attila Tóth <atoth@atoth.sote.hu> - Co-developed-by: Attila Tóth <atoth@atoth.sote.hu> - Signed-off-by: Magnus Granberg <zorry@gentoo.org> - ---- a/node.gyp 2019-10-23 11:52:41.000000000 +0200 -+++ b/node.gyp 2019-11-12 20:58:43.957881862 +0100 -@@ -233,7 +233,9 @@ - 'deps/acorn-plugins/acorn-static-class-features/index.js', - ], - 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)', -+ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)', - 'conditions': [ - [ 'node_shared=="true"', { - 'node_target_type%': 'shared_library', -@@ -436,10 +438,24 @@ - ], - 'actions': [ - { -+ 'action_name': 'run_pax_mkcodecache', -+ 'inputs': [ -+ '<(mkcodecache_exec)', -+ ], -+ 'outputs': [ -+ '<(mkcodecache_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'run_mkcodecache', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(mkcodecache_exec)', -+ '<(mkcodecache_u_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', -@@ -461,10 +477,24 @@ - ], - 'actions': [ - { -+ 'action_name': 'run_pax_mksnapshot', -+ 'inputs': [ -+ '<(node_mksnapshot_exec)', -+ ], -+ 'outputs': [ -+ '<(node_mksnapshot_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'node_mksnapshot', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(node_mksnapshot_exec)', -+ '<(node_mksnapshot_u_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', ---- a/tools/v8_gypfiles/v8.gyp 2019-12-03 16:10:36.000000000 +0100 -+++ b/tools/v8_gypfiles/v8.gyp 2019-12-17 18:37:33.695839254 +0100 -@@ -9,6 +9,7 @@ - 'v8_vector_stores%': 0, - 'v8_embed_script%': "", - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root', - 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h', -@@ -427,6 +425,20 @@ - }, - 'actions': [ - { -+ 'action_name': 'run_pax_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'run_mksnapshot', - 'message': 'generating: >@(_outputs)', - 'variables': { -@@ -442,7 +454,7 @@ - ], - }, - 'inputs': [ -- '<(mksnapshot_exec)', -+ '<(mksnapshot_u_exec)', - ], - 'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"], - 'process_outputs_as_sources': 1, diff --git a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch deleted file mode 100644 index c9c01843cd63..000000000000 --- a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/deps/v8/src/compiler/backend/instruction-selector.cc -+++ b/deps/v8/src/compiler/backend/instruction-selector.cc -@@ -2808,7 +2808,7 @@ - switch (call_descriptor->kind()) { - case CallDescriptor::kCallAddress: { - int misc_field = static_cast<int>(call_descriptor->ParameterCount()); --#if defined(_AIX) -+#if ABI_USES_FUNCTION_DESCRIPTORS - // Highest misc_field bit is used on AIX to indicate if a CFunction call - // has function descriptor or not. - if (!call_descriptor->NoFunctionDescriptor()) { ---- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc -+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc -@@ -1039,7 +1039,7 @@ - linkage()->GetIncomingDescriptor()->IsWasmCapiFunction(); - int offset = (FLAG_enable_embedded_constant_pool ? 20 : 23) * kInstrSize; - --#if defined(_AIX) -+#if ABI_USES_FUNCTION_DESCRIPTORS - // AIX/PPC64BE Linux uses a function descriptor - int kNumParametersMask = kHasFunctionDescriptorBitMask - 1; - num_parameters = kNumParametersMask & misc_field; ---- a/deps/v8/src/execution/simulator.h -+++ b/deps/v8/src/execution/simulator.h -@@ -128,7 +128,7 @@ - #if defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN) - FATAL("Generated code execution not possible during cross-compilation."); - #endif // defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN) --#if V8_OS_AIX -+#if ABI_USES_FUNCTION_DESCRIPTORS - // AIX ABI requires function descriptors (FD). Artificially create a pseudo - // FD to ensure correct dispatch to generated code. The 'volatile' - // declaration is required to avoid the compiler from not observing the diff --git a/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch deleted file mode 100644 index 09d9dbe47be0..000000000000 --- a/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js -index 36420b3450..0afb0b6792 100644 ---- a/deps/npm/lib/config/core.js -+++ b/deps/npm/lib/config/core.js -@@ -151,11 +151,10 @@ function load_ (builtin, rc, cli, cb) { - // Eg, `npm config get globalconfig --prefix ~/local` should - // return `~/local/etc/npmrc` - // annoying humans and their expectations! -- if (conf.get('prefix')) { -- var etc = path.resolve(conf.get('prefix'), 'etc') -- defaults.globalconfig = path.resolve(etc, 'npmrc') -- defaults.globalignorefile = path.resolve(etc, 'npmignore') -- } -+ // gentoo deviates wrt global config; store in /etc/npm -+ var globalconfig = path.resolve('/etc', 'npm') -+ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') -+ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') - - conf.addFile(conf.get('globalconfig'), 'global') - diff --git a/net-libs/nodejs/files/nodejs-gcc-13.patch b/net-libs/nodejs/files/nodejs-gcc-13.patch deleted file mode 100644 index 13427a6b7407..000000000000 --- a/net-libs/nodejs/files/nodejs-gcc-13.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://chromium-review.googlesource.com/c/v8/v8/+/3934140 -adjusted to layout of the node project -From: WANG Xuerui <git@xen0n.name> -Date: Tue, 4 Oct 2022 17:21:03 +0800 -Subject: [PATCH] [base] Fix build with gcc-13 - -See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes. ---- a/deps/v8/src/base/logging.h -+++ b/deps/v8/src/base/logging.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_LOGGING_H_ - #define V8_BASE_LOGGING_H_ - -+#include <cstdint> - #include <cstring> - #include <sstream> - #include <string> ---- a/deps/v8/src/inspector/v8-string-conversions.h -+++ b/deps/v8/src/inspector/v8-string-conversions.h -@@ -5,6 +5,7 @@ - #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - -+#include <cstdint> - #include <string> - - // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may diff --git a/net-libs/nodejs/nodejs-14.21.3.ebuild b/net-libs/nodejs/nodejs-14.21.3.ebuild deleted file mode 100644 index d58d6df5cedf..000000000000 --- a/net-libs/nodejs/nodejs-14.21.3.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - ) - sys-devel/gcc:*" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch - "${FILESDIR}"/${PN}-14.19.0-global-npm-config.patch - "${FILESDIR}"/${PN}-gcc-13.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." -} - -pkg_setup() { - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - 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 ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - # nodejs unconditionally links to libatomic #869992 - # specifically it requires __atomic_is_lock_free which - # is not yet implemented by sys-libs/compiler-rt (see - # https://reviews.llvm.org/D85044?id=287068), therefore - # we depend on gcc and force using libgcc as the support lib - tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - 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 - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-20.0.0.ebuild b/net-libs/nodejs/nodejs-20.0.0.ebuild deleted file mode 100644 index e8cb570919ab..000000000000 --- a/net-libs/nodejs/nodejs-20.0.0.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.44.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) - sys-devel/gcc:*" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -# These are measured on a loong machine with -ggdb on, and only checked -# if debugging flags are present in CFLAGS. -# -# The final link consumed a little more than 7GiB alone, so 8GiB is the lower -# limit for memory usage. Disk usage was 19.1GiB for the build directory and -# 1.2GiB for the installed image, so we leave some room for architectures with -# fatter binaries and set the disk requirement to 22GiB. -CHECKREQS_MEMORY="8G" -CHECKREQS_DISK_BUILD="22G" - -PATCHES=( - "${FILESDIR}"/${PN}-fix-incomplete-type.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - fi -} - -pkg_setup() { - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - # nodejs unconditionally links to libatomic #869992 - # specifically it requires __atomic_is_lock_free which - # is not yet implemented by sys-libs/compiler-rt (see - # https://reviews.llvm.org/D85044?id=287068), therefore - # we depend on gcc and force using libgcc as the support lib - tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - 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 "${ARCH}:${ABI}" in - *:amd64) myarch="x64";; - *:arm) myarch="arm";; - *:arm64) myarch="arm64";; - loong:lp64*) myarch="loong64";; - riscv:lp64*) myarch="riscv64";; - *:ppc64) myarch="ppc64";; - *:x32) myarch="x32";; - *:x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - keepdir /etc/npm - echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm - doenvd "${T}"/50npm - - # Install bash completion for `npm` - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - local drop_tests=( - test/parallel/test-dns-setserver-when-querying.js - test/parallel/test-fs-mkdir.js - test/parallel/test-fs-utimes-y2K38.js - test/parallel/test-release-npm.js - test/parallel/test-socket-write-after-fin-error.js - test/parallel/test-strace-openat-openssl.js - test/sequential/test-util-debug.js - ) - rm "${drop_tests[@]}" || die "disabling tests failed" - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} - -pkg_postinst() { - if use npm; then - ewarn "remember to run: source /etc/profile if you plan to use nodejs" - ewarn " in your current shell" - fi -} |