diff options
Diffstat (limited to 'net-libs/nodejs')
| -rw-r--r-- | net-libs/nodejs/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/nodejs/files/gentoo-global-npm-config.patch | 40 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-5.6.0.ebuild (renamed from net-libs/nodejs/nodejs-5.5.0.ebuild) | 63 |
3 files changed, 77 insertions, 28 deletions
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index cc342c068b3..60ecd06f7ed 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -5,4 +5,4 @@ DIST node-v4.2.2.tar.xz 12791572 SHA256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223 DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923 DIST node-v5.3.0.tar.xz 12776504 SHA256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e SHA512 f65773c35ce774bc6fe242f8627e5786f441f0286f7d272e854e2e2d6b927d5f368c366ff52dd780f7817fedf3935ec25e78ed3f81d4613495663eb81e2afbb1 WHIRLPOOL 5f270ed6fe35dba091bd75e6ad9de419c781fc6f919915a4117b8c0bbb2ea11a05369a9149e4f69614de508ff109eb94b24bdafc0832e91e055f01b0ef214c67 DIST node-v5.4.1.tar.xz 12812444 SHA256 4e7d3fdfeac85c46ddaef0224695620f218e7a178e97d6e210d6d643483f1d53 SHA512 9803478d502bf11bfc77e56109568b0f64186826be35a9b36b47b63ec744595db128955e6f7bec7eb4db39e85afdd364b1215427954ce33ab67689ff03a5bc57 WHIRLPOOL 87f791f4f0722a2d3bcb630d22548f395ac0e86dedc37849caab2d63bc43bad2621058f95eb2b31b1f3b01ec8585c0731c969a1f0167d95495008b44f3b69066 -DIST node-v5.5.0.tar.xz 13059924 SHA256 9c46b4dc9548e43826f71f6571f56e39783c456b9516045b496ea73321731e22 SHA512 8a2d268db2e04d905f879d3b1c1a9a17fb060754ccde86680df85311babf033249730e0ab3f7bd131b16ddaf79d740556e3ee4f37f34a0754be7d9c9080fa683 WHIRLPOOL baf2ec5dc3929a642487d83ebe2e442111379b841b7a2349ba17f372f420f40d4a069098909bffd85ed9e3f34d970ecf542cc80b0df3aac5470c656206cdc481 +DIST node-v5.6.0.tar.xz 13311288 SHA256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 SHA512 ef38d9ce708b8283b7f7441a0c2787e64c0602fb50542b4ccd29e705f879626adf2c1d89a9040af55b1f00b6e45d1d87ca829bf6816768933af9b5661f654aa7 WHIRLPOOL 6b5dcd85a74b47554400a6ff62e4001bb04b9063987571ac4434116d807d04ee58a0ca622973ff4b81c064e4ec1b0cd2f881680eb7f1ced5aeda745bf48538ab diff --git a/net-libs/nodejs/files/gentoo-global-npm-config.patch b/net-libs/nodejs/files/gentoo-global-npm-config.patch new file mode 100644 index 00000000000..e7346b82685 --- /dev/null +++ b/net-libs/nodejs/files/gentoo-global-npm-config.patch @@ -0,0 +1,40 @@ +commit 46ac7cd4229eac5e0182ab62b7ed844c24a8c52e +Author: Johan Bergström <bugs@bergstroem.nu> +Date: Wed Feb 10 22:45:59 2016 +1100 + + npm: set global config folder to /etc/npm + + npm previously assumed that the global config path would be + based on $prefix/etc. Since gentoo installs nodejs into /usr, + this means we're also creating /usr/etc which is less desirable. + + This patch will likely never go upstream. + +diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js +index d1306eb..bd2ef89 100644 +--- a/deps/npm/lib/config/core.js ++++ b/deps/npm/lib/config/core.js +@@ -150,16 +150,14 @@ 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') +- mkdirp(etc, function () { +- defaults.globalconfig = path.resolve(etc, 'npmrc') +- defaults.globalignorefile = path.resolve(etc, 'npmignore') +- afterUserContinuation() +- }) +- } else { ++ ++ // gentoo deviates wrt global config; store in /etc/npm ++ var globalconfig = path.resolve('/etc', 'npm') ++ mkdirp(globalconfig, function () { ++ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') ++ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') + afterUserContinuation() +- } ++ }) + } + + function afterUserContinuation () { diff --git a/net-libs/nodejs/nodejs-5.5.0.ebuild b/net-libs/nodejs/nodejs-5.6.0.ebuild index 796a5f2ea6a..72657ac542f 100644 --- a/net-libs/nodejs/nodejs-5.5.0.ebuild +++ b/net-libs/nodejs/nodejs-5.6.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" @@ -19,27 +19,29 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test" RDEPEND="icu? ( >=dev-libs/icu-56:= ) - ${PYTHON_DEPS} - >=net-libs/http-parser-2.6:= + npm? ( ${PYTHON_DEPS} ) + >=net-libs/http-parser-2.6.1:= >=dev-libs/libuv-1.8.0:= - >=dev-libs/openssl-1.0.2e:0=[-bindist] + >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib" DEPEND="${RDEPEND} + ${PYTHON_DEPS} !!net-libs/iojs test? ( net-misc/curl )" S="${WORKDIR}/node-v${PV}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}"/gentoo-global-npm-config.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 ! test-flag-CXX -std=c++11 ; then - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." - fi - fi + ( [[ ${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() { @@ -80,7 +82,7 @@ src_prepare() { BUILDTYPE=Debug fi - epatch_user + default } src_configure() { @@ -121,10 +123,10 @@ src_compile() { src_install() { local LIBDIR="${ED}/usr/$(get_libdir)" - make install DESTDIR="${ED}" PREFIX=/usr + emake install DESTDIR="${ED}" pax-mark -m "${ED}"usr/bin/node - # set up a symlink structure that npm expects.. + # 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 @@ -134,18 +136,24 @@ src_install() { 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; + sed -i '/fonts.googleapis.com/ d' $i; done # Install docs! dohtml -r "${S}"/out/doc/api/* 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/lib64/node_modules/npm/lib/config/core.js" + sed -i -e "s|'/etc'|'${D}/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 - rm "${LIBDIR}"/node_modules/npm/lib/utils/completion.sh + sed -i -e "s|'${D}/etc'|'/etc'|g" "${ED}/${npm_config}" || die # Move man pages doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* @@ -154,22 +162,21 @@ src_install() { rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - local temp_name=("'AUTHORS*'" "'CHANGELOG*'" "'CONTRIBUT*'" \ - "'README*'" "'.travis.yml'" "'.eslint*'" "'.wercker.yml'" \ - "'.npmignore'" "'*.md'" "'*.markdown'" "'*.bat'" "'*.cmd'") local find_exp="-or -name" - local find_name=( "${temp_name[@]/%/ ${find_exp}}" ) - # drop last "-or -name" - find_name[-1]="${find_name[-1]%${find_exp}}" - local find_iname="-iname 'LICEN?E*' ${find_exp}" + 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 \( \ - ${find_iname} ${find_name[@]} \ - \) \) - eend $? + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; fi } @@ -179,8 +186,10 @@ src_test() { } pkg_postinst() { - einfo "When using node-gyp to install native modules, you can avoid" - einfo "having to download the full tarball by doing the following:" + 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 "node-gyp --nodedir /usr/include/node <command>" + 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>" } |