diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
| commit | 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch) | |
| tree | a8a537b82fda83a0799c2ca9887f212558363aa7 /net-libs | |
| parent | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff) | |
gentoo resync : 11.05.2021
Diffstat (limited to 'net-libs')
31 files changed, 369 insertions, 452 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex cf4e18a65548..68c2842e724c 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest index 9809144b0775..232cd2be9d2c 100644 --- a/net-libs/glib-networking/Manifest +++ b/net-libs/glib-networking/Manifest @@ -1,7 +1,7 @@ DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5 DIST glib-networking-2.68.0.tar.xz 237992 BLAKE2B dab2b692c48366ba71325e1808d51a1d7614c29c21448f6d95388c262ec7c6d647489be933595d4e38151d1eef70385181d891d6613e6d1a0a2c95b3b0d764e9 SHA512 3961851d1c39352bc6cbacbc966a7ad075467ca17006eca432ea0646b660fed85951951aee72597a8a595420e6160fd91dca612c241a0505f4f0a67922ef1771 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22 -EBUILD glib-networking-2.66.0.ebuild 1731 BLAKE2B 1c6d54281519fdf26a5d3b92b97228832caf633e215dd2a25cf771d39bcdc09352581387becc77c05cad4e5bb64da31ddfec27c41fb5ced1abf023f4d742321d SHA512 1a259111f5cf387d775083a2c22e4bb40a640bf76f9157f4d0a63052fd599d7b488ce648480a84537a29c88c1bafdedf88cf689907ff74268d5e46b4623d1ec3 -EBUILD glib-networking-2.68.0.ebuild 2084 BLAKE2B 186a10f4c6bb5d5a029c1bf7c94ad911ef215ab30399f48cb4f715cecfe45bd1e23dad51527f9a8d2bd1971c36c4abccb5a9b4ecb4ad3a8c2bea61e77ff60c57 SHA512 4470c628b24ff3df4eeb27d640530c2557940a35d9001c75ab62a8aec399f8096b660f009b939ceedf668f537f64bbbd5c816c8649d07352118ef63783bb4dbf -EBUILD glib-networking-2.68.1.ebuild 2084 BLAKE2B 186a10f4c6bb5d5a029c1bf7c94ad911ef215ab30399f48cb4f715cecfe45bd1e23dad51527f9a8d2bd1971c36c4abccb5a9b4ecb4ad3a8c2bea61e77ff60c57 SHA512 4470c628b24ff3df4eeb27d640530c2557940a35d9001c75ab62a8aec399f8096b660f009b939ceedf668f537f64bbbd5c816c8649d07352118ef63783bb4dbf +EBUILD glib-networking-2.66.0.ebuild 1732 BLAKE2B 6cbfdd30ba6c617476e3f650c8d410526d85eb64733acd2c540d1d17582e07d8b614f0154a80123267e5765aac42ae8160b9e948522b9c6f464731401a427681 SHA512 24558ff4378c928f7fedf49da0b8274a91bedcf52baba3f44db4e085af2bf44b6d9fc0e552937fe36c1c593b4468daa1cec69729d32c63be4d0a29a5546c7ade +EBUILD glib-networking-2.68.0.ebuild 2085 BLAKE2B dfc363273c029ee981e018b71ddb847f4b18a088c9b09cc2404c0c47acb6a0602babc12c14d4feb82b8dc8d6e61878d0eb24918dbd0a238972db6e7df84679c8 SHA512 b274ed487420d6fab68f65282e8d10b4f20ebf0689c39f685ca6de56938ac760316e108832db853d3ddde88dca3a8413e8cb9c916543d0577a1eba865ad51097 +EBUILD glib-networking-2.68.1.ebuild 2085 BLAKE2B dfc363273c029ee981e018b71ddb847f4b18a088c9b09cc2404c0c47acb6a0602babc12c14d4feb82b8dc8d6e61878d0eb24918dbd0a238972db6e7df84679c8 SHA512 b274ed487420d6fab68f65282e8d10b4f20ebf0689c39f685ca6de56938ac760316e108832db853d3ddde88dca3a8413e8cb9c916543d0577a1eba865ad51097 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050 diff --git a/net-libs/glib-networking/glib-networking-2.66.0.ebuild b/net-libs/glib-networking/glib-networking-2.66.0.ebuild index 07241df42db4..1fa9ad6c2836 100644 --- a/net-libs/glib-networking/glib-networking-2.66.0.ebuild +++ b/net-libs/glib-networking/glib-networking-2.66.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit gnome.org gnome2-utils meson multilib-minimal xdg DESCRIPTION="Network-related giomodules for glib" -HOMEPAGE="https://git.gnome.org/browse/glib-networking/" +HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking" LICENSE="LGPL-2.1+" SLOT="0" diff --git a/net-libs/glib-networking/glib-networking-2.68.0.ebuild b/net-libs/glib-networking/glib-networking-2.68.0.ebuild index 5d4e94cae8f7..8c9ab087457f 100644 --- a/net-libs/glib-networking/glib-networking-2.68.0.ebuild +++ b/net-libs/glib-networking/glib-networking-2.68.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit gnome.org gnome2-utils meson multilib-minimal xdg DESCRIPTION="Network-related giomodules for glib" -HOMEPAGE="https://git.gnome.org/browse/glib-networking/" +HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking" LICENSE="LGPL-2.1+" SLOT="0" diff --git a/net-libs/glib-networking/glib-networking-2.68.1.ebuild b/net-libs/glib-networking/glib-networking-2.68.1.ebuild index 5d4e94cae8f7..8c9ab087457f 100644 --- a/net-libs/glib-networking/glib-networking-2.68.1.ebuild +++ b/net-libs/glib-networking/glib-networking-2.68.1.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit gnome.org gnome2-utils meson multilib-minimal xdg DESCRIPTION="Network-related giomodules for glib" -HOMEPAGE="https://git.gnome.org/browse/glib-networking/" +HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking" LICENSE="LGPL-2.1+" SLOT="0" diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index 17b1ca0dc9b3..fbdb58b8d08a 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -2,5 +2,5 @@ AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95 EBUILD gnutls-3.6.15.ebuild 4304 BLAKE2B ac36fdbe080003eee3519cbc05ac7b8bcd2013ca24e5269d37d841b5199df3c4140287505b98e45943b47304adb3cd5136d604ccbbf25fcf1fbec8ece24e5f18 SHA512 891490e57eb4aaf60877a060b24c2d783a6e85807456ff6856563d4c9fe30641b101ed67934ab9a5743f868d5e1e1552029ef079f712fd9a771bb1abb3d6876b -EBUILD gnutls-3.7.1.ebuild 4240 BLAKE2B a53df62983590ce9052deb810b474563b7d5c046e3de5fcfb026c78962f7237f798be322e940cf78ba1949863bd0aac48606cb87f8e3f0be1af49bed43050f41 SHA512 e54a53d940060f0fa5e037478aa49a6eed4bf3293806a8045e8850918dd7b4cff54cd7786178fe9f17124ef8de2ef7b20cf2e85f5ea8e946ca153c782e51eaa5 +EBUILD gnutls-3.7.1.ebuild 4234 BLAKE2B 4bbcb12ad050cc5194549d429a161a2530aa0bcf60f7dd781d7a8f5b39e3be5d1d37405550177c5e027f64d14ff34781b51fbc624df035787be95bb3da67156d SHA512 251faee18d4b560902b235dd787e5bf48fa453b82c9896c83ea42b0d50d875790d5fc2a1c80fd6e4e39dd9970b8205b1bac50b72265d1c0f6755ac51b78de39d MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a diff --git a/net-libs/gnutls/gnutls-3.7.1.ebuild b/net-libs/gnutls/gnutls-3.7.1.ebuild index ece149c18554..2a251871c77b 100644 --- a/net-libs/gnutls/gnutls-3.7.1.ebuild +++ b/net-libs/gnutls/gnutls-3.7.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30" # libgnutls.so number -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" REQUIRED_USE=" diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest index 8811d781fd18..7ea2b2da3df8 100644 --- a/net-libs/gtk-vnc/Manifest +++ b/net-libs/gtk-vnc/Manifest @@ -1,7 +1,6 @@ -AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9 -DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929 -DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148 +AUX gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch 1692 BLAKE2B 6ac0db2a08ec541bb213099e19a67eb7d295b8439c0562032de964343b4c698e6dea3227b0e4fff1dbb5bd3bde715d1bc288ed70b7efe5972ad78407213bc331 SHA512 02c3294e7e94a7f0bc2223c59362351a7256a5934e8c2b9304d226be7d289f2759c9222c2d715364438669048178ad722bcff8c8f31049bd7fa0c1b9780361ce +AUX gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 755 BLAKE2B 95934ecb04553fd3153a2d0b81e52a487f922b888868d395a423e28f2d94c1012f9cda4025d79e855e371161a191c6c7b9c6dd6fc8acd603f91286ef9492dac3 SHA512 060ba2f9a95ae6fa790b6481acc3d23b93220b733b1e2966e80c33a7a802dbdf84a55023da381efd037b23cb1ca698251fc6b3779debfe7bf21b9e5ce5c54d76 +AUX gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch 1052 BLAKE2B 8ba4a7c553bf2af5a4cb6fde0daaa990db67f6fc105d64b03c555f2a091063249dddf657d03907f4d63220dd26d42d10e9be01e766459399b1a7ce4b824e62ea SHA512 d288723785d143bd306b0ff85d25658709f22a75d5a294b43b3e45ef8a84f40bbd00017b84da776453097a218f642d337c2308ca965b0cde0a1a3e97f3b6bae3 DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb -EBUILD gtk-vnc-1.0.0.ebuild 1850 BLAKE2B 08f14959a9440e1fd8a404d287633bdd4eb7bd1ae134f5ff011dc13d6800572426bb50ad8ad173864785f381defe1d677c9e8c5f0ead404f09336f01a72309b0 SHA512 7121e7e4181db642101072fd2f3b7337268edc0cb69961bc203184111c6c1db92734669c1f3926f4af00f7b90a1917aed215d6e32e80df2dd7d2f34781a866f1 -EBUILD gtk-vnc-1.2.0.ebuild 1573 BLAKE2B 29268356e8fd5a33d1eeeeaae1c0f0a718b01115355607cfd9d45072aba6ad3a6c10b667931e10a1982a57e38a5c2692e4bc3f78a2f74ec702bc77fe75fe5657 SHA512 d2770a023396eba61f14b402a0367a7bee89de744363ae107ee1ff09dd20b7b65b80a1a04262214d793d96cc0074a6cd6757ab3454b5f9e5f22a7579cc8067e2 +EBUILD gtk-vnc-1.2.0.ebuild 1726 BLAKE2B df068d3bea9685e002579f981cda026260b159948cf127f8152b10c0f102acb43d7a065b79a3d08cd1922bd661f4bb69a0c35450923f5896bbfc92d6ef9ac96b SHA512 20a13ba3044552513299c611bb35b732aca2cced2ce218e9b56947f9386c14acf990119844e09bb09172dd84b889c6665f3361ff5807f25f7dc0f9a4fa9780cb MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06 diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch new file mode 100644 index 000000000000..eba775dd3a52 --- /dev/null +++ b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch @@ -0,0 +1,59 @@ +From e540fbc34d6bbfe3e84f1d9c33deaacc2326c7c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com> +Date: Mon, 26 Apr 2021 17:38:13 +0200 +Subject: [PATCH 1/3] build: improve --with-coroutine=auto choice +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the required ucontext functions aren't found, switch to gthread +coroutines instead of failing during the build. + +These functions are absent from the POSIX.1-2008. + +Fixes: https://gitlab.gnome.org/GNOME/gtk-vnc/-/issues/11 + +Signed-off-by: Jakub Janků <jjanku@redhat.com> +--- + meson.build | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 8052d43..e9829e6 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,8 +43,20 @@ cc = meson.get_compiler('c') + + coroutine = get_option('with-coroutine') + ++uctx_args = [] ++if host_machine.system() == 'darwin' ++ uctx_args += ['-D_XOPEN_SOURCE=600'] ++endif ++has_ucontext = true ++foreach uctx_func : ['makecontext', 'swapcontext', 'getcontext'] ++ if not cc.has_function(uctx_func, prefix: '#include <ucontext.h>', args: uctx_args) ++ has_ucontext = false ++ break ++ endif ++endforeach ++ + if coroutine == 'auto' +- if host_machine.system() == 'windows' ++ if host_machine.system() == 'windows' or not has_ucontext + coroutine = 'gthread' + else + coroutine = 'ucontext' +@@ -52,6 +64,9 @@ if coroutine == 'auto' + endif + + if coroutine == 'ucontext' ++ if not has_ucontext ++ error('ucontext requested, but not available') ++ endif + conf_data.set('WITH_UCONTEXT', true) + elif coroutine != 'gthread' + error('Unknown coroutine backend') +-- +2.26.3 + diff --git a/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch index f26a85719b08..bd72b5727927 100644 --- a/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch +++ b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch @@ -1,7 +1,9 @@ -From a51acc0c353959e8af06a031724a79cfe6b60963 Mon Sep 17 00:00:00 2001 +https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/15 + +From 4609ad35b6dc11f016ac3a50158eeef7f19d9889 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp <leio@gentoo.org> Date: Sun, 5 Apr 2020 00:05:49 +0300 -Subject: [PATCH] meson: Find python explicitly to honor downstream python +Subject: [PATCH 3/3] meson: Find python explicitly to honor downstream python choice --- @@ -9,10 +11,10 @@ Subject: [PATCH] meson: Find python explicitly to honor downstream python 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build -index 461d8d2..a09aee9 100644 +index 5306fb9..247c597 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -308,7 +308,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [ +@@ -319,7 +319,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [ 'vncdisplaykeymap.c', ] @@ -22,5 +24,5 @@ index 461d8d2..a09aee9 100644 'xorgevdev', 'xorgkbd', -- -2.20.1 +2.26.3 diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch new file mode 100644 index 000000000000..fd305f777c5d --- /dev/null +++ b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch @@ -0,0 +1,36 @@ +https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/14 + +From bdab05584bab5c2ecdd508df49b03e80aedd19fc Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Wed, 28 Apr 2021 17:16:54 -0400 +Subject: [PATCH 2/3] meson: Fix configuration failure with + -Dwith-vala=disabled + +Otherwise with_vala is not defined, and meson setup results in + + src/meson.build:169:5: ERROR: Unknown variable "with_vala". +--- + meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index e9829e6..777876c 100644 +--- a/meson.build ++++ b/meson.build +@@ -318,12 +318,11 @@ gir = find_program('g-ir-scanner', required: get_option('introspection')) + with_gir = gir.found() + + vala_opt = get_option('with-vala') ++with_vala = false + if not vala_opt.disabled() + if not with_gir + if vala_opt.enabled() + error('Vala API requires GObject introspection (-Dintrospection=true)') +- else +- with_vala = false + endif + else + with_vala = add_languages('vala', required: vala_opt) +-- +2.26.3 + diff --git a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild deleted file mode 100644 index 1229170f2861..000000000000 --- a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -inherit gnome.org vala meson python-any-r1 xdg - -DESCRIPTION="VNC viewer widget for GTK" -HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+introspection pulseaudio sasl +vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.42.0:2 - >=x11-libs/gdk-pixbuf-2.12.0:2 - >=dev-libs/libgcrypt-1.5.0:0= - >=net-libs/gnutls-3.1.18:0= - >=sys-libs/zlib-1.2.5 - sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) - >=x11-libs/gtk+-3.0.0:3[introspection?] - >=x11-libs/cairo-1.2.0 - >=x11-libs/libX11-1.6.5 - pulseaudio? ( >=media-sound/pulseaudio-10.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.56.0:= ) -" -# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup -# perl for pod2man -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-lang/perl-5 - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -PATCHES=( - # Few fixes from origin/master + optionality patches filed as https://gitlab.gnome.org/GNOME/gtk-vnc/merge_requests/6 - "${WORKDIR}"/patches - "${FILESDIR}"/${PV}-honor-python-ver.patch -) - -src_prepare() { - vala_src_prepare - xdg_src_prepare - # Don't add -O2 explicitly to CFLAGS - sed -i -e "/'-O2'/d" meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_feature pulseaudio) - $(meson_feature sasl) - -Denable-werror=false - -Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps - $(meson_use vala with-vala) - ) - meson_src_configure -} diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild index f5587f996c28..e879d2277a27 100644 --- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild +++ b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="+introspection pulseaudio sasl +vala" REQUIRED_USE="vala? ( introspection )" @@ -41,7 +41,9 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/1.0.0-honor-python-ver.patch + "${FILESDIR}"/${P}-build-improve-with-coroutine-auto-choice.patch + "${FILESDIR}"/${P}-meson-Find-python-explicitly-to-honor-downstream-pyt.patch + "${FILESDIR}"/${P}-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch ) src_prepare() { @@ -54,14 +56,8 @@ src_configure() { $(meson_feature introspection) $(meson_feature pulseaudio) $(meson_feature sasl) + -Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps $(meson_feature vala with-vala) ) - - if use elibc_musl; then - emesonargs+=( -Dwith-coroutine=gthread ) - else - emesonargs+=( -Dwith-coroutine=auto ) - fi - meson_src_configure } diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest index 92522e4f574b..b91ca7fdc22f 100644 --- a/net-libs/libgfbgraph/Manifest +++ b/net-libs/libgfbgraph/Manifest @@ -1,5 +1,5 @@ DIST gfbgraph-0.2.3.tar.xz 270772 BLAKE2B 4e9e1d9ed5d0bc58d6b01f6d58d7d9dc8cddb28c09bc820927e242a7d6118aabc8e4d808050205cf2d516571c598a0dbc75e09588e64d53db1456d519d23b810 SHA512 4e03beb4172a591c7d1eb4cfac56009b0d25183168f73344d24ac47554334d1edf2c5087c523025cee5d565182a02dc7ef72adc66cff1e4ad53a1d0990d3afb8 DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68 -EBUILD libgfbgraph-0.2.3-r1.ebuild 1005 BLAKE2B 8ffb8d2eec96a712eaa1ee1041e392edefe989d7915e753ecd9f52bb914dbbe0fbea18358d950aabab248960c17bba8d6eab3917f9040b039595a0518311a71e SHA512 d1d34aaf526c849097384343fbd9a8dab1400b93ebcb913ca348a376374aba0d356f61a0fb75bedc6dc595926148155cf05455606136594288ce0386dbe767d0 +EBUILD libgfbgraph-0.2.3-r1.ebuild 1006 BLAKE2B be3882ee37d967b20c803d07c0dcd051399671d8a469c7f672895a667f3e3dfc938c3489ad52b3ef3e6d673bfd7b01e678f1d994692904a679af85c37e246d92 SHA512 3dc3a0436f7c3801e362e087ffe745ab9f6de8f5b64147f9e37f4f26e62d09b4cd37a2d21623a5ecbfbe388d32b0c6037005a951aeb4ffaad6e15c5e6a3727f3 EBUILD libgfbgraph-0.2.4.ebuild 1243 BLAKE2B 39b30bc1ad7f7cadcae0e486ff2194b84be4bd2bf5dbd5ca6d9afae2b543cf4c1c35dc26c9655cb68352aa74162474882aefc3d430d08caee7150a8f13135670 SHA512 54e129a0a37c3119a06a1b8652766695c266589e49d4c105c6f904e90ab708f622443a2dbbef02b0b35f5bc55168939f0574318554ddc3dbb56eddb7a8626e81 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild index 9d4cdb22e139..e0b6639ad064 100644 --- a/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild +++ b/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild @@ -8,7 +8,7 @@ GNOME_ORG_MODULE="gfbgraph" inherit gnome2 DESCRIPTION="A GObject library for Facebook Graph API" -HOMEPAGE="https://git.gnome.org/browse/libgfbgraph/" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph" LICENSE="LGPL-2.1+" SLOT="0.2" diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest index e92b6a3d4309..79b21f83ba71 100644 --- a/net-libs/libmicrohttpd/Manifest +++ b/net-libs/libmicrohttpd/Manifest @@ -1,5 +1,7 @@ DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13 DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316 +DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3 EBUILD libmicrohttpd-0.9.68-r1.ebuild 1200 BLAKE2B 3973e2a7077ad323d8177237d0a4e067303d6a9234bea971b0f541b67d680234d5edee136c34ee6b1078ee186a969f273d7f01b2067adffab2f9301f816576de SHA512 59fc30ceb6fa7dff759f115f8ce626085204e34e4d887d79a851fa5f9827b2570c047b76ae9ff5f2be3bea61e6e294347805c1161db827b606be93dc91588e6c EBUILD libmicrohttpd-0.9.72.ebuild 1236 BLAKE2B 21e77d98dc6839be7c55dfdefec799cdfb49f5631f05c61da8436ef27640201916c0987d9beba802dbabf823ec80f7724e38a379a085d45be3101459ed074c7b SHA512 1df698bac5e462b9475d0fbf7b0b2810852b23d5cfb0e3cd003eabc4fbd4de10b28679a9c776c4ce7a4d732f06062f81ea4a61a7bb243149809c70d75aa53007 +EBUILD libmicrohttpd-0.9.73.ebuild 1425 BLAKE2B 540305f963f2e8e29c1293d27cf856984e52ec1618f63a0f87769190c8a7a91157f15ae4da9b2d4fd034f8f7a595fec9bfcea47a1765609ff23e98d81abf04b4 SHA512 1cb00654b7f32836a2e046c92cede0e0244021b5fbf41219aa81a759bee7d7f2b36eb7ee365e5b1f0af34bbc8ed9dbe31ff129bc9ab9ef68726e7f560e710c61 MISC metadata.xml 594 BLAKE2B 2cd0819db9dbf19c9c7c04aaa3e373d77aa448edf18629ed2ffce1d5dcda573cfb788e3f86354c07b99660f27a91845ef3c7c8e8a8c76cd604015165f373098f SHA512 098269a2b2464ec0a55430c1a60808e3441b307a0aca9df0a062a17e49e9da38e27f8b77be897cdd9048107649a96108fab2e7c5c0d6502fda072f690b031f3d diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild new file mode 100644 index 000000000000..d881dcb779b6 --- /dev/null +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit multilib-minimal + +MY_P="${P/_/}" + +DESCRIPTION="Small C library to run an HTTP server as part of another application" +HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" +SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="LGPL-2.1" +SLOT="0/12" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+epoll ssl static-libs test thread-names" +RESTRICT="!test? ( test )" + +# libcurl is linked to for tests and the +# curl binary is used during tests too +# if available +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )" +DEPEND="${RDEPEND} + test? ( net-misc/curl[ssl?] )" +BDEPEND="virtual/pkgconfig + test? ( net-misc/curl[ssl?] )" + +DOCS=( AUTHORS NEWS README ChangeLog ) + +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --disable-nls \ + --enable-bauth \ + --enable-dauth \ + --disable-examples \ + --enable-messages \ + --enable-postprocessor \ + --enable-httpupgrade \ + --disable-experimental \ + --disable-heavy-tests \ + $(use_enable thread-names) \ + $(use_enable epoll) \ + $(use_enable test curl) \ + $(use_enable ssl https) \ + $(use_with ssl gnutls) +} + +multilib_src_install_all() { + default + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index 5d80690e8d44..38f88b8a1bb2 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -3,6 +3,6 @@ DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25 EBUILD libnftnl-1.1.7.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5 EBUILD libnftnl-1.1.8.ebuild 1174 BLAKE2B 4d768841a0625afef9522b2addb2dcb7a6c60935456392d14bc52f111b9a226478ebe00e81da64d13c53bbe11f31e21d2fb89a19fc78136fe1f7cd13eaa44e9f SHA512 7446d029fdeed5157d19db65a7a81cba8bf25037cb73588825983cdf76a178291975215be798eb20554cd6078b29be1dd5f958f6760f5d13203b28c78998f6a2 -EBUILD libnftnl-1.1.9.ebuild 1174 BLAKE2B 4d768841a0625afef9522b2addb2dcb7a6c60935456392d14bc52f111b9a226478ebe00e81da64d13c53bbe11f31e21d2fb89a19fc78136fe1f7cd13eaa44e9f SHA512 7446d029fdeed5157d19db65a7a81cba8bf25037cb73588825983cdf76a178291975215be798eb20554cd6078b29be1dd5f958f6760f5d13203b28c78998f6a2 +EBUILD libnftnl-1.1.9.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5 EBUILD libnftnl-9999.ebuild 1363 BLAKE2B 4ae61af654e23b0ba0bf2289291ddbf104f497cdf0d62397961ad5269f2864b99da1f6e803fbb158732e4ad16f284f4cc5fa2dc2081252a67690d43524b221a2 SHA512 0fb3a1814221ebc9a3296b6e08db738080285334308e3f8c6cc7e1a805e7cd7115f119c536f24d2bcccc50d07940e79da5894b7f5d6030cfef1d1c0f765ec460 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-libs/libnftnl/libnftnl-1.1.9.ebuild b/net-libs/libnftnl/libnftnl-1.1.9.ebuild index e08a48df5f0b..2592a59415cf 100644 --- a/net-libs/libnftnl/libnftnl-1.1.9.ebuild +++ b/net-libs/libnftnl/libnftnl-1.1.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="examples static-libs test" RESTRICT="!test? ( test )" diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest index d613061f49e8..f0433cccf44d 100644 --- a/net-libs/libzapojit/Manifest +++ b/net-libs/libzapojit/Manifest @@ -1,3 +1,3 @@ DIST libzapojit-0.0.3.tar.xz 272108 BLAKE2B 7bd606b01cb9b92c844a35d4229e52347c5193033c4fe483eb2fcf5bf76c9773cc26741d7eed8d52c1352767c65055088335ffb0779d390988292956b367584f SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3 -EBUILD libzapojit-0.0.3.ebuild 825 BLAKE2B 0f1531022dbc28ba0d6c110fa1caae04de8a08556bb4938b70e491fd14466b9127d98b4746ceb7e46db9ccfddc4a5c9febbccf4593b9b06706efb55928493823 SHA512 5969780d24996f33477c0d6ab1b87246dc682289506e96cf3b877d131ad1df5c1f1b110321b331254e25f24541c62f18bdfd17d01a8fbda6edb379d77223bf50 +EBUILD libzapojit-0.0.3.ebuild 827 BLAKE2B 63fb455821a323ec9a9364fbac10930bfb49271179f95bff41d2aaeff947912faca1b2264a3700f0f413462ec29e70e8e32ad77cc707736abc2f9f786aa88d6e SHA512 16b48dccbbc623d6f7e7ead7521555e3b23b68ed16a5d42f629fd9a452c05dadd0d8276b5546bdac6369c7797972accf37a2fb0d9fff7160347b33731461fa2d MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild index 22052543e795..c5f25a502ef2 100644 --- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild +++ b/net-libs/libzapojit/libzapojit-0.0.3.ebuild @@ -7,7 +7,7 @@ GCONF_DEBUG="no" inherit gnome2 DESCRIPTION="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" -HOMEPAGE="https://git.gnome.org/browse/libzapojit" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libzapojit" LICENSE="LGPL-2.1" SLOT="0" diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 8a56e80b6066..567e36b6643c 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -7,17 +7,15 @@ AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396 AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86 -AUX nodejs-16.0.0-v8_lto.patch 1332 BLAKE2B 75807eecfca7275afdde465ad20d558822e06488ecfc9d22a0e57826abafb3f3b66f77484fcdc078142ba7293d627a25d7d3ccdfecc7610cb076f919900c794c SHA512 26e4e1a64356800de20609543ddbac2e5adad04faf28962cbbfcb6499e3a9d38e391f945353ac3f5e9f997dfb666aa3260b0296e55317f9aa2c8c3f4bd894003 +AUX nodejs-16.1.0-test-repl-history-navigation.patch 1970 BLAKE2B 7c33e36c1faafabff42e0b98ca83fe25433fadfc77196158abb2a7e6fdaad09fcdeb0aed75a1424e8e96425b10a7e396b21cd8ac3cb06f20a632f4cf38b76060 SHA512 d53bc20931bc3f6c20ed0d9b050e95a2aa698b9dd73d0faf8628e6e0f07c030c3dd4d6504ec4b962c9932384d85683188692ef3fac264a73785f3c961ce72454 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0 -DIST node-v16.0.0.tar.xz 33784448 BLAKE2B 3286cf6522074cb7b17dce8fce642204777fef26fd4bdb904fdef638061913a1eccda13b8e2f170906dd9098500c8fae7eaea7275e41bf97ea6d9fdd644b215c SHA512 6b976a8959079751bfdece15614a6286088d9145fc4db4ae048aca2ede4b7e38e86e91b1722be51eb4c934749a144a745e425ccf118bed9848c30ff254de2557 DIST node-v16.1.0.tar.xz 33770472 BLAKE2B 2b7cf5f07dbf72eb25018cd046ce15cf6c5a444225e34d425614c19e69888b4f5c9488b079fed12e6fe52cb8dfdee20cf61c4df5a39f53e60b95c4da445f2091 SHA512 dc12078203940e7b280198ae15f51f68aaefcf8cab71a9f988952e67045e4b16dc48ec471abcc497bd15b0b426c06678e376b53762349d6568b48d52888cc2d5 -EBUILD nodejs-12.22.1-r1.ebuild 6862 BLAKE2B f3dc14d263dccc7303cb4474ab793d3c6c0114feb1f75966576c908c0f049591b45bad99b3a9fbead5a76adce9e13d238bc1ff583b199be648b3d95abbda082d SHA512 c3ebea970e031fc1692b6f8bc3a4de1e57100e7f1a36cdaab69159816fbba5d8098b9820a464b3fb05f1c4ae658a4410d783306a10bedd1baa2b6f0178dd2aae +EBUILD nodejs-12.22.1-r1.ebuild 6976 BLAKE2B 65c091a3834df7f256fe9f24d81c4a350bc80d2c73c97190d376d65106948511843ad5610bbfaced8dcd8a2839abfb402f9119d8142354e5fb2b0ec53e601005 SHA512 06f2f07ba8a0e5173549fbf3d01ff92e58e3ed4c7f3cb048d03e561f58ce1d79112c25c6486625c7b971d8118860ffe75f493b5ea684359709a74e43a4e50276 EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a -EBUILD nodejs-14.16.1-r1.ebuild 6890 BLAKE2B a6e1eb484326c55b3a38ab13e76a46f634d3d03e61186b7323444f11063d3d58a82bbb3d8b63b38ec583a16455306fa466a74fa1595d2a4dca0d8422f7b38dff SHA512 ac0e157c8291b3388e219a22fadf25f4350e49888769ba306b12f9fb2c90d48b568cf7a9213d002a6eac046b1c26ba4cf9294c6b75194b54cc38ba55462af8b1 +EBUILD nodejs-14.16.1-r1.ebuild 7025 BLAKE2B abaf829b8f37b6f985319e770e5888c376e3845eeca30ec4f40d8bfbb0f7205ea030d42c74e0c0364d9f7cef35ecbc79f241daa92c4ff85999f1c7d675f5f502 SHA512 f3a4580d9396a6bd2993219e85eb50d7653e0f49ac6c8ee04c2020430d2e21ba1f4d2002d8595ca338a791b96bc0ce4457080cd1104fa2b5f0dd45b484ffc9b5 EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3 -EBUILD nodejs-16.0.0-r1.ebuild 6572 BLAKE2B b96895e82435e6801d839f2b4d87b08f337c2b3d03e09d20f900a9371835956601d15c023d2472759737001708be3591e7aaeb6fec316b2565754bceb5ce58e9 SHA512 306f97d21a259a07511ba666a37aa9b3bf21546da4e0447d46403ce141d638e34d9f3e7a80fddf8821d8cdb154582cd2458c0c03fbc474802dee0dfc4062812a -EBUILD nodejs-16.1.0.ebuild 6261 BLAKE2B e6fcaf943e25b08de9ae6708779ce495b9390c03c3dd3750e06c4ee609753a22e48b41d43229632240a2c26edc966f89dcea2860d722f02f0f85c4617a04c9ab SHA512 6e5405b52b9b292bf5cf72d5dc7887b982c8521765188061782e83e7c8ea5531a904d16e536e3ce7efcf4a972451a785da9b12b02892db274853398e9db6db2a -EBUILD nodejs-99999999.ebuild 5829 BLAKE2B c6c38b692df78a6292fda7f651ab9be5502f202d4c69831c4ae639b873e7d5b846899f245e88bb49bcbfe154750e6512dab01223e57c3188dae61112696b0a65 SHA512 ecc304e439c60d1f7f64e448e81eb12675fda7f8471b0a6341711c435509de81c90eb170c63a4c2b9f4cc5fcbd8fc604c40d6affa41d827f4f5ec46f474f0ae9 +EBUILD nodejs-16.1.0.ebuild 6669 BLAKE2B 4411616ca4379b122d832a32801aee91dcdd4d4396f02c3a1b0ef2c48a69108eff7ec0739ab435479a6a94c203ac8fdd3bf2eb98fee4d6ee21cde54a7346118e SHA512 758c31953bb6e94794ce6877d3196b4d89d196a2ba5cb27d51c51c5a6676a400662bfce9a2fa3a9c9e95d7ece8bf64e2eb46c62370f1d8babbaac06ab6060709 +EBUILD nodejs-99999999.ebuild 6486 BLAKE2B c686818d5a5f832f3520ef3c4c5458526aac4894c251a2c589bcfff5e313b7b7602fb7d58bc89e7fbfdea28eeb4b570748026d38e8060430aea1b983b49a7698 SHA512 49a89ee3ef022a9d1866a33a4643d23f362c39442725a7267aa55c12898dd7d96dceb95fc44bdf36112b18c93ec9dde6124cec34b3b277e4be2fa740ffde4b4a MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489 diff --git a/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch b/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch deleted file mode 100644 index a3e4acb02c3a..000000000000 --- a/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea694e2b138d2f991989e09fc0e964fec3587b5f Mon Sep 17 00:00:00 2001 -From: Jesse Chan <jc@linux.com> -Date: Thu, 22 Apr 2021 19:41:09 +0800 -Subject: [PATCH] tools: disable LTO for "v8_cppgc_shared" target - -"PushAllRegistersAndIterateStack" is implemented in assembly and -called from "stack.cc" via 'extern "C"'. [1] - -However, LTO does not work well with symbol usage from assembly. [2] - -This change workarounds the issue by disabling LTO for the target. - -With GCC 10 and "./configure --enable-lto", compilation succeeds -after this change. - -[1] v8/v8@c10863153 -[2] https://gcc.gnu.org/wiki/LinkTimeOptimizationFAQ#Symbol_usage_from_assembly_language - -Refs: #35957 -Refs: #38335 -Signed-off-by: Jesse Chan <jc@linux.com> ---- - tools/v8_gypfiles/v8.gyp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp -index ccb5984f47d..377e12d1fdc 100644 ---- a/tools/v8_gypfiles/v8.gyp -+++ b/tools/v8_gypfiles/v8.gyp -@@ -1378,6 +1378,9 @@ - '<(V8_ROOT)/src/heap/base/worklist.h', - ], - 'conditions': [ -+ ['enable_lto=="true"', { -+ 'cflags_cc': [ '-fno-lto' ], -+ }], - ['clang or OS!="win"', { - 'conditions': [ - ['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', { diff --git a/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch b/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch new file mode 100644 index 000000000000..724541a870db --- /dev/null +++ b/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch @@ -0,0 +1,56 @@ +From 7c8a60851c459ea18afbfc54bfc8cf7394ea56c3 Mon Sep 17 00:00:00 2001 +From: Antoine du Hamel <duhamelantoine1995@gmail.com> +Date: Thu, 6 May 2021 12:00:07 +0200 +Subject: [PATCH] test,repl: fix tests when inspector is disabled + +Fixes: https://github.com/nodejs/node/issues/38558 + +PR-URL: https://github.com/nodejs/node/pull/38564 +Reviewed-By: Anna Henningsen <anna@addaleax.net> +Reviewed-By: James M Snell <jasnell@gmail.com> +Reviewed-By: Rich Trott <rtrott@gmail.com> +--- + test/parallel/test-repl-history-navigation.js | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/parallel/test-repl-history-navigation.js b/test/parallel/test-repl-history-navigation.js +index df4f0390a69c..527cf235bddd 100644 +--- a/test/parallel/test-repl-history-navigation.js ++++ b/test/parallel/test-repl-history-navigation.js +@@ -559,14 +559,14 @@ const tests = [ + env: { NODE_REPL_HISTORY: defaultHistoryPath }, + test: ['const util = {}', ENTER, + 'ut', RIGHT, ENTER], +- expected: common.hasIntl && common.hasCrypto ? [ ++ expected: [ + prompt, ...'const util = {}', + 'undefined\n', +- prompt, ...'ut', ' // il', '\n// {}', +- 'il', '\n// {}', ++ prompt, ...'ut', ...(prev ? [' // il', '\n// {}', ++ 'il', '\n// {}'] : [' // il', 'il']), + '{}\n', + prompt, +- ] : [], ++ ], + clean: false + }, + { +@@ -577,7 +577,7 @@ const tests = [ + 'globalThis.util = {}', ENTER, + 'ut', RIGHT, ENTER, + 'Reflect.defineProperty(globalThis, "util", utilDesc)', ENTER], +- expected: common.hasIntl && common.hasCrypto ? [ ++ expected: [ + prompt, ...'const utilDesc = ' + + 'Reflect.getOwnPropertyDescriptor(globalThis, "util")', + 'undefined\n', +@@ -588,7 +588,7 @@ const tests = [ + prompt, ...'Reflect.defineProperty(globalThis, "util", utilDesc)', + 'true\n', + prompt, +- ] : [], ++ ], + clean: false + }, + ]; diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild index f96dac1dcb1a..84110ff87064 100644 --- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild +++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild @@ -10,13 +10,19 @@ inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" -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/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + +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 ~x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) @@ -52,7 +58,6 @@ PATCHES=( "${FILESDIR}"/${PN}-99999999-llhttp.patch ) RESTRICT="test" -S="${WORKDIR}/node-v${PV}" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild index c386c0e45b7c..82f78fb0068e 100644 --- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild +++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild @@ -10,11 +10,18 @@ inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" -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/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + +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 ~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 ) @@ -46,8 +53,6 @@ PATCHES=( "${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch ) -S="${WORKDIR}/node-v${PV}" - pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." @@ -89,13 +94,6 @@ src_prepare() { sed -i -e "/'-O3'/d" common.gypi node.gypi || die - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || 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 @@ -105,6 +103,13 @@ src_prepare() { # 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 } @@ -230,5 +235,5 @@ src_test() { fi out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } diff --git a/net-libs/nodejs/nodejs-16.0.0-r1.ebuild b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild deleted file mode 100644 index 95528f2021f9..000000000000 --- a/net-libs/nodejs/nodejs-16.0.0-r1.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -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/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" - -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 )" - -# As of 16.0.0, tests fail because "npm is not ready for this release" -RESTRICT="test" - -RDEPEND=">=app-arch/brotli-1.0.9 - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.0 - >=net-libs/nghttp2-1.41.0 - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" -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}-12.22.1-uvwasi_shared_libuv.patch - "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch - "${FILESDIR}"/${PN}-16.0.0-v8_lto.patch -) - -S="${WORKDIR}/node-v${PV}" - -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 use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -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 - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || 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 ) - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - 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 - keepdir /etc/npm - - # 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() { - # parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" - fi - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild index 61ddcf50edb9..f8ca995c2e13 100644 --- a/net-libs/nodejs/nodejs-16.1.0.ebuild +++ b/net-libs/nodejs/nodejs-16.1.0.ebuild @@ -10,11 +10,18 @@ inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" -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/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + +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 ~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 ) @@ -42,10 +49,9 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch + "${FILESDIR}"/${PN}-16.1.0-test-repl-history-navigation.patch ) -S="${WORKDIR}/node-v${PV}" - pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." @@ -70,10 +76,6 @@ src_prepare() { export V=1 export BUILDTYPE=Release - # See https://github.com/nodejs/node/issues/38558 - # FIXME: temporary, until we have figured out why that one single test fails. - rm -f test/parallel/test-repl-history-navigation.js - # 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 @@ -100,6 +102,13 @@ src_prepare() { # 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 } diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 110b22734b40..2b81f6a39ed8 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -2,52 +2,67 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils + +inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" -EGIT_REPO_URI="https://github.com/nodejs/node" - LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - inspector? ( icu ssl ) + +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 ~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-ssl? ( ssl ) -" + system-icu? ( icu ) + system-ssl? ( ssl )" + +RESTRICT="!test? ( test )" -RDEPEND=" - >=app-arch/brotli-1.0.9 +RDEPEND=">=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.16.1 + >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib - icu? ( >=dev-libs/icu-67.1:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} + system-icu? ( >=dev-libs/icu-67:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" +BDEPEND="${PYTHON_DEPS} sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" + pax_kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." + if [[ ${MERGE_TYPE} != "binary" ]]; then + if use lto; then + if tc-is-gcc; then + if [[ $(gcc-major-version) -ge 11 ]]; then + # Bug #787158 + die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" + fi + else + # configure.py will abort on this later if we do not + die "${PN} only supports LTO for gcc" + fi + fi + fi } src_prepare() { @@ -72,13 +87,6 @@ src_prepare() { sed -i -e "/'-O3'/d" common.gypi node.gypi || die - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || 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 @@ -86,7 +94,14 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch ) + 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 } @@ -94,6 +109,9 @@ src_prepare() { src_configure() { xdg_environment_reset + # LTO compiler flags are handled by configure.py itself + filter-flags '-flto*' + local myconf=( --shared-brotli --shared-cares @@ -102,7 +120,14 @@ src_configure() { --shared-zlib ) use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) + 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 ) @@ -156,24 +181,19 @@ src_install() { fi if use npm; then - dodir /etc/npm + keepdir /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 "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die + 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=() @@ -196,6 +216,12 @@ src_install() { } src_test() { + # parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox + if has usersandbox ${FEATURES}; then + ewarn "You are emerging ${P} with 'usersandbox' enabled." \ + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + fi + out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest index b88de7a9ff28..747454d320c3 100644 --- a/net-libs/zeromq/Manifest +++ b/net-libs/zeromq/Manifest @@ -1,5 +1,5 @@ DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e EBUILD zeromq-4.3.3-r1.ebuild 1447 BLAKE2B d800a1dbe54ba94b039b798d9fe7610a62e3ebcde63fba5205063305dbd0bf2fc80a4e1ce57120abd03904e201e159e62e2724935ebae3fc086c343116ef6fd9 SHA512 ac5b1d8570b6c6ee0de56615e4296a18148be0fd29bfad7a404f7d995d22d2d893399ffb2c6b31ca036b622556d3bb3274640ff224d41a49213f66f353302a21 -EBUILD zeromq-4.3.4-r1.ebuild 1454 BLAKE2B acf7b942a644f9a4f7422427a1d682545b0b95da0fab1bddf500d56c915d7412675c20e37c98181cfdd7c7ac19f474fcacd025302c8a71b77edfe35cdc1b4a4e SHA512 47aa6d638a425fc4957819c02c4eef956402d13d841d90f8be25059c8e0398d9cc82dece4229df990d161a1b8ccd492df16af0c3bbbc6c58548aecac2a969c41 +EBUILD zeromq-4.3.4-r1.ebuild 1447 BLAKE2B d800a1dbe54ba94b039b798d9fe7610a62e3ebcde63fba5205063305dbd0bf2fc80a4e1ce57120abd03904e201e159e62e2724935ebae3fc086c343116ef6fd9 SHA512 ac5b1d8570b6c6ee0de56615e4296a18148be0fd29bfad7a404f7d995d22d2d893399ffb2c6b31ca036b622556d3bb3274640ff224d41a49213f66f353302a21 MISC metadata.xml 1624 BLAKE2B 7b976e279cfe109beb64a36ac3469bdbbad43efc7100f1d8d4322b0cab0ddb6921fe8457cec260e36b6830c6e8b4b070dc49c30cffa6597895d4fb87a3927b06 SHA512 9b970662649051cc83c5d2e483a344f377eeca2f0fa7bea7200af26fa35aa6cf88ac64875ed87e92a64cd06269fc09c449b45a3d388a58ce24ec02b29326c4cf diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild index 9a32f20db6b1..da4a09e97c25 100644 --- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild +++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin" RESTRICT="!test? ( test )" |