From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-981994-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BCB10139083
for <garchives@archives.gentoo.org>; Thu, 2 Nov 2017 22:59:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1B2B1E0B73;
Thu, 2 Nov 2017 22:59:45 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DFBF5E0B73
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Nov 2017 22:59:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CED9B341793
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Nov 2017 22:59:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 54BE09242
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Nov 2017 22:59:42 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1509663536.4948d969fb226bd11720a703e790c5e786c25f6b.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/, net-libs/nodejs/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/nodejs/Manifest net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch net-libs/nodejs/nodejs-8.8.1.ebuild
X-VCS-Directories: net-libs/nodejs/files/ net-libs/nodejs/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 4948d969fb226bd11720a703e790c5e786c25f6b
X-VCS-Branch: master
Date: Thu, 2 Nov 2017 22:59:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ddd57cba-2d13-4406-aedd-ff4500210b3c
X-Archives-Hash: 544af188db72248b73caac1b03a060cd
commit: 4948d969fb226bd11720a703e790c5e786c25f6b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 22:58:56 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 22:58:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4948d969
net-libs/nodejs: Old.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
net-libs/nodejs/Manifest | 1 -
.../nodejs/files/nodejs-8.7.0-shared-nghttp2.patch | 105 -----------
net-libs/nodejs/nodejs-8.8.1.ebuild | 196 ---------------------
3 files changed, 302 deletions(-)
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 6dd15aee55e..29725eebb79 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,6 +3,5 @@ DIST node-v4.6.1.tar.xz 13295568 SHA256 fe2a85df8758001878abb5bbaf17a6b6cdc12b3e
DIST node-v4.8.5.tar.xz 13316060 SHA256 a48aeefc2b4fae0ea6410a8045ca106af244223012eab003bd5cb00aa3b50d53 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12 WHIRLPOOL 8d74323f38b4f55bf2e95a628005cbb65c0f4ea0e5dd55699408e26b724ff65fd0a7f674399ed92ac3a56592064133daffcbb37d7076b8da33d28b4d17d61410
DIST node-v6.11.5.tar.xz 15699404 SHA256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 WHIRLPOOL 6e572e34d473544624734a54243dc41101e91d045f2b9cedc0c1a65c90584deb163efb422a0c992689ef9878cc5b882758795ae4d902c1c5b20468d8fa2151da
DIST node-v6.9.4.tar.xz 15519264 SHA256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce WHIRLPOOL d1bcf488ed1aae7959303b988c9467fc5d0930166c7bfe0e441392763e19f788496971c07560a9f62586bbb2be7ce741ece8346140d665d29593b9b8f649b002
-DIST node-v8.8.1.tar.xz 18209260 SHA256 5ce2c47ab779992db49942f757a01cc5131db5cef4e0dd270e48151b0887b57a SHA512 368eafd66d2108ebce4593bf496e129287949ea6d6b7d4b1f0f02e91ae1ef9632a63838dda752f12b4c2b133c2b2ae74b390717c02778c427e8e17964c002c0f WHIRLPOOL 26ab36f120ad068f5e36c06c6c7224fdaedcfd88d519ff573a984d83b07c5aafe0fcc773ebedab43326de32e20bfed4c681c7f14a9563733b0f091bc0ded39a5
DIST node-v8.9.0.tar.xz 18284720 SHA256 ae8258f89e127a76d4b4aff6fdb8dc395b7da0069cba054b913dfc36b3c91189 SHA512 0dc585b9f7f91f76bcfc742d5fdbd55b7e2676ba48f9354e825560658f0ab0726dd5fab9c8aa4c251f8812363aab1ea2dab1e04f526fee95b1a99ac180490a7d WHIRLPOOL e64fc14b0253f457d95958aaa55d93801e437df72a9b838e0f6bfa765ecacc819814111bd02b39331164efbc095c940be7ec8a8ba4690e0b73d61df037a9387e
DIST node-v9.0.0.tar.xz 18244756 SHA256 5b52bd6a90a611a42e11a908022ccfc1c2e77dcc70bfe38054a18dc57a3d5fa5 SHA512 3b7770c294b20df0ce321e03038dd8ef69ef81539c02ec5e2ef6e7d98fee9446f8ab0fd537812fd87c43e4b24018e39111c406dd657d251f28417ad7e870962d WHIRLPOOL dd1cb8aa379f0c3d2d5c89c44ca3542086ff3008226b2e154ef461e3baeb1c4ad4d53910181dad124beaa14bcc800adcd65ec31fcfb038af3e2e0b4fed892f20
diff --git a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
deleted file mode 100644
index 5f5a2c7b7ff..00000000000
--- a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -182,6 +182,27 @@
- dest='shared_http_parser_libpath',
- help='a directory to search for the shared http_parser DLL')
-
-+shared_optgroup.add_option('--shared-nghttp2',
-+ action='store_true',
-+ dest='shared_nghttp2',
-+ help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+ action='store',
-+ dest='shared_nghttp2_includes',
-+ help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+ action='store',
-+ dest='shared_nghttp2_libname',
-+ default='nghttp2',
-+ help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+ action='store',
-+ dest='shared_nghttp2_libpath',
-+ help='a directory to search for the shared nghttp2 DLL')
-+
- shared_optgroup.add_option('--shared-libuv',
- action='store_true',
- dest='shared_libuv',
-@@ -1360,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
- configure_library('http_parser', output)
-+configure_library('nghttp2', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
- # stay backwards compatible with shared cares builds
---- a/node.gyp
-+++ b/node.gyp
-@@ -14,6 +14,7 @@
- 'node_module_version%': '',
- 'node_shared_zlib%': 'false',
- 'node_shared_http_parser%': 'false',
-+ 'node_shared_nghttp2%': 'false',
- 'node_shared_cares%': 'false',
- 'node_shared_libuv%': 'false',
- 'node_use_openssl%': 'true',
-@@ -151,8 +152,15 @@
- 'type': '<(node_target_type)',
-
- 'dependencies': [
-- 'node_js2c#host',
-- 'deps/nghttp2/nghttp2.gyp:nghttp2'
-+ 'node_js2c#host'
-+ ],
-+
-+ 'conditions': [
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
-+ ]
-+ }]
- ],
-
- 'includes': [
-@@ -163,8 +171,7 @@
- 'src',
- 'tools/msvs/genfiles',
- 'deps/uv/src/ares',
-- '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
-- 'deps/nghttp2/lib/includes'
-+ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
- ],
-
- 'sources': [
-@@ -691,6 +696,15 @@
- 'deps/http_parser/http_parser.gyp:http_parser'
- ]
- }],
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
-+ ],
-+ 'defines': [
-+ # We're using the nghttp2 static lib
-+ 'NGHTTP2_STATICLIB'
-+ ]
-+ }],
- [ 'node_shared_libuv=="false"', {
- 'dependencies': [
- 'deps/uv/uv.gyp:libuv'
---- a/node.gypi
-+++ b/node.gypi
-@@ -251,6 +251,10 @@
- 'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
- }],
-
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+ }],
-+
- [ 'node_shared_cares=="false"', {
- 'dependencies': [ 'deps/cares/cares.gyp:cares' ],
- }],
diff --git a/net-libs/nodejs/nodejs-8.8.1.ebuild b/net-libs/nodejs/nodejs-8.8.1.ebuild
deleted file mode 100644
index 2739d2a8cd9..00000000000
--- a/net-libs/nodejs/nodejs-8.8.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
- npm? ( ${PYTHON_DEPS} )
- >=net-libs/http-parser-2.7.0:=
- >=dev-libs/libuv-1.15.0:=
- >=net-libs/nghttp2-1.25.0
- >=dev-libs/openssl-1.0.2g:0=[-bindist]
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
- "${FILESDIR}"/gentoo-global-npm-config.patch
- "${FILESDIR}"/nodejs-8.7.0-shared-nghttp2.patch
-)
-
-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."
-}
-
-src_prepare() {
- tc-export 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
-
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || 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}'/" lib/module.js || 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
-
- # 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
-
- default
-}
-
-src_configure() {
- local myarch=""
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
- use npm || myconf+=( --without-npm )
- use icu && myconf+=( --with-intl=system-icu )
- use snapshot && myconf+=( --with-snapshot )
- use ssl || myconf+=( --without-ssl )
- use debug && myconf+=( --debug )
-
- 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" \
- "${PYTHON}" configure \
- --prefix="${EPREFIX}"/usr \
- --dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
- "${myconf[@]}" || die
-}
-
-src_compile() {
- emake -C out mksnapshot
- pax-mark m "out/${BUILDTYPE}/mksnapshot"
- emake -C out
-}
-
-src_install() {
- local LIBDIR="${ED}/usr/$(get_libdir)"
- emake install DESTDIR="${D}"
- 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
- # Patch docs to make them offline readable
- for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
- sed -i '/fonts.googleapis.com/ d' $i;
- done
- # Install docs!
- dohtml -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="$(emktemp)"
- "${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
-
- 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
-}
-
-src_test() {
- out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
- einfo "The global npm config lives in /etc/npm. This deviates slightly"
- einfo "from upstream which otherwise would have it live in /usr/etc/."
- einfo ""
- einfo "Protip: When using node-gyp to install native modules, you can"
- einfo "avoid having to download extras by doing the following:"
- einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}