commit: 79ae762f24b37251e14919b829893ef1dc93a3b5 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Sep 16 07:19:37 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Sep 16 07:21:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ae762f
net-libs/nodejs: Versions 12.18.4 14.11.0 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Bug: https://bugs.gentoo.org/742893 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-libs/nodejs/Manifest | 2 + ...odejs-99999999.ebuild => nodejs-12.18.4.ebuild} | 50 ++++++++++++++-------- ...odejs-99999999.ebuild => nodejs-14.11.0.ebuild} | 21 +++++---- net-libs/nodejs/nodejs-99999999.ebuild | 8 ++-- 4 files changed, 51 insertions(+), 30 deletions(-) diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 3a686a1a61b..840184ab69b 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,7 +1,9 @@ DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4 DIST node-v12.18.3.tar.xz 23679596 BLAKE2B 496a8fa0f0368634a900c5961b442cb9ef9e0cf7cb0fc974a9e29624fc40077a61bd6371851d5487b9eeeb50ebf6a238e5db5c801fef000c7cb15bd990cadae2 SHA512 a1c72d4664fbead4e63736abe46417b13dcd0581c7c9f8a94ca5c5b2bd782fefabac63e63f824dda6a771c3b5e647749e3156a611dcb100aad11c3f23e17ed5d +DIST node-v12.18.4.tar.xz 23679924 BLAKE2B 14de3c83851b89f85f7d6f549d9e43e3e97c7a84de94eef8c3a2789e960595749726b8039fdff1be822377355ede2bb95bba4fd1d17c3e5165c844a80eb32e53 SHA512 07101a9acc8dee5189f8484746715b57d4227d819e38a79c100da33f803b0f061e7b37fbd4114ce2bc3eea647726f8786880d3096dfab187c177679f3e1c78e8 DIST node-v14.10.0.tar.xz 33377228 BLAKE2B fc2e0b38c0cd56fa524cc01dd262003ba0dbb4f755b9b95079a4aedea75c75b1e588de8cee4503a9699b1fed9983db8827828fe622c1ea32f9d3ee21aeabc3e4 SHA512 902bfe3b142f11ef48076c4af6f3107fb20f617ef1f12a564fc3ea1870e6304458dd30fb9af67c3431b850caa496bbb55cb1d760e46c882603543685d316c733 DIST node-v14.10.1.tar.xz 33383116 BLAKE2B 68959ad1ed576af327b53080099d8f1e520658f9c7aeb342ba4182f6f058e48d93b1c443e2a91348a221224bfa430a16cbe13b33f339b41eff4a6e41fc1e85db SHA512 fd094fb3ff1f94e913ee876de4365ba1f6d26abd33b60e964fbdf8a205ab8a44885bd69576ec997aee7b36b91a342daf3654bec41377d0ec66e752292aab4319 +DIST node-v14.11.0.tar.xz 33379456 BLAKE2B 99e2eba4ba2e54209836fa1e3b63e42caf854d7f3bc99f5836300b0795ef8c785b78bd7c6b99148604f0bb1b34a5169c72e8be0f8d4f62412e7d352fce15ca18 SHA512 5014ebaeb109b0ecaca8f795a4e1a626c03b1132f9b8bac8826b734633c14e9f99b4f079c185a1f43f6938a1e543e5838f520159c3e08ca454398039fd26ef11 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3 DIST node-v14.8.0.tar.xz 33342288 BLAKE2B 4f8129beb16ece09f14c234395b29bc53e84896fdd9877821a27c80d88a0740d42ea4dcf65a0a5c52a98129262be236207f4c07d81f76cc5e4471f21227083e9 SHA512 ebb20f7163e20e8074dd9cc5d3ee7f3cbc536c55a7753d39c482ea90e9314d8fdfe1a88203be7f250f6d77b9f13da04d32d99770d300c2ab0dfdee3d7582f068 diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-12.18.4.ebuild similarity index 80% copy from net-libs/nodejs/nodejs-99999999.ebuild copy to net-libs/nodejs/nodejs-12.18.4.ebuild index e7b61f1ab58..af217c2f69d 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-12.18.4.ebuild @@ -2,19 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 eutils 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"; +SRC_URI=" + https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz +" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -RESTRICT="!test? ( test )" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) @@ -22,25 +23,28 @@ REQUIRED_USE=" " RDEPEND=" - >=dev-libs/libuv-1.35.0:= - >=net-dns/c-ares-1.15.0 - >=net-libs/nghttp2-1.39.2 + >=dev-libs/libuv-1.39.0:= + >=net-dns/c-ares-1.16.0 + >=net-libs/http-parser-2.9.3:= + >=net-libs/nghttp2-1.40.0 sys-libs/zlib - icu? ( >=dev-libs/icu-66.1:= ) + icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) " DEPEND=" ${RDEPEND} " PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch + "${FILESDIR}"/${PN}-99999999-llhttp.patch ) +RESTRICT="test" +S="${WORKDIR}/node-v${PV}" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ @@ -51,7 +55,7 @@ pkg_pretend() { } src_prepare() { - tc-export AR CC CXX PKG_CONFIG + tc-export CC CXX PKG_CONFIG export V=1 export BUILDTYPE=Release @@ -85,9 +89,6 @@ src_prepare() { BUILDTYPE=Debug fi - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch ) - default } @@ -95,7 +96,11 @@ src_configure() { xdg_environment_reset local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib + --shared-cares + --shared-http-parser + --shared-libuv + --shared-nghttp2 + --shared-zlib ) use debug && myconf+=( --debug ) use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) @@ -130,6 +135,8 @@ src_configure() { } src_compile() { + emake -C out mksnapshot + pax-mark m "out/${BUILDTYPE}/mksnapshot" emake -C out } @@ -193,5 +200,14 @@ src_install() { src_test() { out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die + "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die +} + +pkg_postinst() { + elog "The global npm config lives in /etc/npm. This deviates slightly" + elog "from upstream which otherwise would have it live in /usr/etc/." + elog "" + elog "Protip: When using node-gyp to install native modules, you can" + elog "avoid having to download extras by doing the following:" + elog "$ node-gyp --nodedir /usr/include/node <command>" } diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-14.11.0.ebuild similarity index 92% copy from net-libs/nodejs/nodejs-99999999.ebuild copy to net-libs/nodejs/nodejs-14.11.0.ebuild index e7b61f1ab58..43b93416662 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-14.11.0.ebuild @@ -4,17 +4,18 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 eutils 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"; +SRC_URI=" + https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz +" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -RESTRICT="!test? ( test )" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) @@ -22,11 +23,11 @@ REQUIRED_USE=" " RDEPEND=" - >=dev-libs/libuv-1.35.0:= - >=net-dns/c-ares-1.15.0 - >=net-libs/nghttp2-1.39.2 + >=dev-libs/libuv-1.39.0:= + >=net-dns/c-ares-1.16.0 + >=net-libs/nghttp2-1.41.0 sys-libs/zlib - icu? ( >=dev-libs/icu-66.1:= ) + icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" @@ -41,6 +42,8 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch ) +RESTRICT="test" +S="${WORKDIR}/node-v${PV}" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ @@ -86,7 +89,7 @@ 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 ) default } diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index e7b61f1ab58..70e923f68c0 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -22,11 +22,11 @@ REQUIRED_USE=" " RDEPEND=" - >=dev-libs/libuv-1.35.0:= - >=net-dns/c-ares-1.15.0 - >=net-libs/nghttp2-1.39.2 + >=dev-libs/libuv-1.39.0:= + >=net-dns/c-ares-1.16.0 + >=net-libs/nghttp2-1.41.0 sys-libs/zlib - icu? ( >=dev-libs/icu-66.1:= ) + icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND="
