Version bump. Adapt gyp-nodejs symlink structure. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/127 by jbergstroem.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 161 insertions, 16 deletions

diff --git a/net-libs/iojs/ChangeLog b/net-libs/iojs/ChangeLog
index e53b33a4d23b..09dba5936e5d 100644
--- a/net-libs/iojs/ChangeLog
+++ b/net-libs/iojs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/iojs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.18 2015/05/18 16:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.19 2015/05/26 10:18:33 mgorny Exp $
+
+*iojs-2.1.0 (26 May 2015)
+
+  26 May 2015; Michał Górny <mgorny@gentoo.org> +iojs-2.1.0.ebuild:
+  Version bump. Adapt gyp-nodejs symlink structure. https://github.com/gentoo
+  /gentoo-portage-rsync-mirror/pull/127 by jbergstroem.
 
 *iojs-2.0.2 (18 May 2015)
 
diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest
index eb3f44fd02fc..36c0c326c8da 100644
--- a/net-libs/iojs/Manifest
+++ b/net-libs/iojs/Manifest
@@ -16,6 +16,7 @@ DIST iojs-v1.7.1.tar.xz 10867156 SHA256 3c63010701b1968baf08d99327821c79746d0602
 DIST iojs-v1.8.1.tar.xz 11617684 SHA256 8b9b4a141daca22e6bf28e8af86ce5f9ca5918d08923fb5619b7e614a674d966 SHA512 eaee8c20e827c66359e2661fbf82a20139946829a43fa2e8ff409031ca9e081fb877d64d64670c662ecd15ead6c80f201e57fdb83d0ff5f6c6d2098569c2bb07 WHIRLPOOL c046dcad252e71a83b2e2a00aa8f6cdfb221c06f597945ee3ee4d391d4fd854cf971ba78e701a0672536542b860db18c4ef9333f6606ce294b4f3ea2830d1612
 DIST iojs-v2.0.1.tar.xz 11702524 SHA256 aa9f1d385e79689cb0c8311a607a726daafd6027428f1a33b2a16b2d08815290 SHA512 4c89d682bdfea87d86a5aba6643be82e0febc4e5458f649ea37ab0f4df9e9dad0ed139741cf0a8dd46f44910cbd1782f8b6c0abc98721d515e2e6b2c3ef9f3ed WHIRLPOOL aaa6c3b27471fae9391a8264c9e074b19585e36057b43d2aa12dc627aac5579a13c3f028d756d8de1b65bd441c20894c0584c954f38467b098fb0b7dd459cb76
 DIST iojs-v2.0.2.tar.xz 11900380 SHA256 afab3752cf9143a13784cd9d9c38b0ff5fd4aa77dffded2f5c3742c42b9743a2 SHA512 18166f3427d91269431f56f93407653c52fe0d9cbe846322a6d56f43af4a2bf1d66e49a2f179a390e76077608f5ff842a0f90588477b2d1c931e98346bbcb550 WHIRLPOOL e9829c1f14b69d9a035566663d983ea9778b92d47cf31844aa2afa4672e78b6f5f0b2ab8ae13e30c45740d2a14760d1d8c046f1e2ca8fc2da7f8ec25ae805989
+DIST iojs-v2.1.0.tar.xz 11976228 SHA256 b9bb7fb626a0f0f0babb3b042f61eba55ff0dec4645682fbb36b5bab13d5dd29 SHA512 66c06f2482faf9be2585a718a144cbbaceca3498e823659147c2b8592b073a9b49afd9e708df5057a905fea13e65c3c421d537418fa2891345b76c65a486fc70 WHIRLPOOL 76c0a1ec5b820c3b97ec760ecdb79fd4bd782e3a9fd04c9cc289f1e9e6c6cf900bc3f041f135fed094c2634f8d37db4485257c25a1cfdd997b74f5e715ba9354
 EBUILD iojs-1.0.4-r1.ebuild 3206 SHA256 884a98f1736ded1fdc73b076307054763eead3cbb69fb6198b7238832cfc6f46 SHA512 99519f8f678ada8dc6c25645866e382a5994cdb4d65792bfad43a3e2018599d02d2762d51b6b2961622b3eaf5da1c005bc78d762e506c92ed4045da8c6800a7d WHIRLPOOL 65edebb0c07bc39bdf00eb368f37a08e2c3e9e46bce29c4cb43942fc1e9cacc6e1e5ff39e89f3749a43b58c31636dbd9e1b7fccd703bdda7a852f078194ef3dc
 EBUILD iojs-1.0.4.ebuild 2944 SHA256 4a78febd3440bc5fa021312c3994e462e5da8ed0e916003369bd0398bdd46e56 SHA512 15888b7647b29f50e9488a6497672aa2a686c1646b1403914cacfc51ce5b87a73417bbc0e384e4551fcdd2f631a33e4ffd5b089a692f4ac674c11ecde51824f7 WHIRLPOOL 22becab91f294b04ff7207fdd594e5639d51d9168d8bc6344f3332f88dede4e0dbfac03e0e46ef3bfe211f7f5caa08211d306563fbec1a236801747b6317fec0
 EBUILD iojs-1.1.0.ebuild 3203 SHA256 d861b5e857e2ec150b7469e2928f13642944323027dd249406e7782fa7e8739e SHA512 fc9630b1e2b9db03f5a9e9aa7239321cd197b661bbcb9564b04755d25ef12bd92160abec20067a46a3ebd0160650713e00707c4e8ce87219a6fd799824c6133b WHIRLPOOL 84b40270e7f440c9caef7cff80ef2c30c18ce9830f66eb4c0316cba14c84e1e6fb9ab8cc9b59ae7f978c5433836470e7efae8d7d69467e7b4527c4a6b426fdd0
@@ -30,24 +31,25 @@ EBUILD iojs-1.7.1.ebuild 3948 SHA256 60e08093c4888e4379d78c48d3ff401e27415b6cd33
 EBUILD iojs-1.8.1.ebuild 3818 SHA256 3fea337b52954df88f84e484090cfeb80bd56f4236d0b4ea746908cea43f430a SHA512 c114a1908832b0c47a61172b6e49d779b8efb5513508f26fa12bf13458d4f093632b1c8ea36fff45b0c666b51f2d638d4ec4682495d76f149ffd7b032426de42 WHIRLPOOL 3cc0d546dd72aedb0f583c99912669aee501a4af1f8c9df0d8d6949b7a8b705b337403c517f3ea577e1c2d36e110ccd4f05e5293ea49d5567dbe7552d4a64753
 EBUILD iojs-2.0.1.ebuild 3871 SHA256 b872aef434618d725144f9a59ecd05e93bba2350ccf61974cd74751dc1321c81 SHA512 b390582459341951f9ec8382513239d5bf38343bead1503f7a61a59a3ee3b4b6274f35392df34cd2adbb9c2fc26b494f8400b5b4182b9112f507ee1edc95e613 WHIRLPOOL c5d912266429479a01b8d018d4fe6a72fc689b49b4e2669646853c0ec7799ff6cb0eccd5938324f993c3ca378a3c24b970564197a02254a632adae7307b064c1
 EBUILD iojs-2.0.2.ebuild 3871 SHA256 54a2749e976136b8bcff78e4904587484d2bdb8364507edbc19b6f71d0af19c8 SHA512 76b1e1466a32de30769dbcbdb6131824f509a6cf8696f9db90e6aee9d83827a832216db7f11be6e4ae5b9e6920608b3956869eae64bda20da35e9139d363b59b WHIRLPOOL 1ac7fa4214fcd05de9275a2c5c9c31375f0cfb3da9c33bee70653b3f35627ce0fc3611d097e0a5d39feed22463b24dd762df7522a953564f0b33a60bd8ecc4c0
-MISC ChangeLog 2967 SHA256 6b91a7b6577a2fefa39ae0aef8b202d2753e54cadaca750a652f6e13d6e8d3bf SHA512 88d699fd9d1e9e8f4da396e5049a01a9909ddccb9c59ab424e032169a401d9342545452458e1b6e35ae78b863979ad0996d0b62e73c68c9591fd60649f462beb WHIRLPOOL 2b99b5a2a11fabf4112ef1c15272c5442c380864d200bbcaf75b1347a8560e300cda66f230ead41056ba66620aac882d132244ac5e2d357c0429963de171348a
+EBUILD iojs-2.1.0.ebuild 4248 SHA256 d8d15cdc3940574a95ea5c92ae47aab85262cec4368f54b4863c39f1d943b62b SHA512 c7617921bb18ed4f462574dc27967a808467c3647ee5e4f534d5e1c21e7a82055fc777473385daf72f0955718ec47f24ba0397de9ca87a5fdae9bc66d42269a9 WHIRLPOOL ef41340a4921eaade607877e716cc3582b6c0b5922a3341466956c784dd693202228a010ed57c188bc57b9eb436cadddab10309dd27eae1118c2fd0fa3e60fab
+MISC ChangeLog 3199 SHA256 87d1ff33323c36fce31aa013a6b16ff9935c01582514628f97833ec62e1c53c8 SHA512 08f6677b543a5efd6ad8a9c3e46284a29631f4ba3d3a20c1ea5a74a77ed6c62677b987bc6354774c2a13541951911916f224267305fdab1377a35ae6f5a4bfe3 WHIRLPOOL 3e72d78f796db8e92e58b55b58ac87cffd86b81af71b7ca7bf0380ca24c81a751624b12265642dfb95060239eac61080d48d4a9eabd3c045e36f284b94ecd14f
 MISC metadata.xml 945 SHA256 df3d5c5619158cca7f6b52111bb8c7d42ffc231061389c134984dfe7771f98e1 SHA512 ba2ae70644d857bed881e0fa67a2ce2a5741fe2e72d585c12bf81ec2ba42e414a76acae2601ccec0359fc700e5a275899c0212ed7a3079eec0da0a87a1d274a5 WHIRLPOOL 466a076e90fa6e2f9b0a802b3114ebaedd512ba735abdb0792948550c8fadbeea803c1f962efe631480141f23a034c3d3fc0aa9619ddb38b404136c885230841
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVWg0PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVZEh6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOleoQAM1IGKAKAVC57MGgYc2Kcjmz
-8rHAtGAZ5NoFajlmHzmemu6guZcXWNsIdb5FuB4IV0/5irJ0HTsYsRLA4zK7cvhr
-v+Kbx/QqdhlbcvwDbczCnntJDvOD9KJn9bN6dqBkIya3NjvjGRzEx8lV4dgLHbw+
-Ab5xLXzPVQrwsHRnlTeAZuqMNHKDaln9jnp94rhjGyezbW2+eI5YtrEnS1al0/3/
-ZkaIKfujbQR5RiONg1Y8xDlnCHj2fc0UYbR/7EPXYXOA18rE0JHqOWKp5LQrwfct
-ORQ0q6Pct0fn6gcK27BqwB5jFHxLjQu1RPVDAVc16bvKmEgI1CWsB6jks/zETnkD
-ep/efC1bEjMpIP3bqb7WI2nCwV+7OpoDpKpm1NfpEyNAJYpdbPYC1B7kTaZCNhBN
-+K5IB4aO7Aeirq2z2WO9dcxXU9ZHHIM0evu0YLCOs/f/JR7FawOClPn3/XIGw424
-SdIe+l001lBGqM3q28W0GhgLwJlJx274dPaVoepQMie6GUu4Ok59aduzNTzy7h1s
-RnZrdr8fG6mQCIvhs2xnHHW41mfzt8Vlnro3FiWhEuPkSHpCGU2FU/w6SUDEvmiB
-9vT4QGgErHPekXadbUsIE87YvF9lrNH9QaDLg1Y4qlBle0JZHV3atp3pWd8uHzvr
-2HOo+cVT7fsAPcczT5nR
-=wnUJ
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyW4P/2OfR0nFh570Cu6LQVIiqndY
+FwKtPkT1QFtV+11zuUhjnrEtmoCggTh0JCOrK9QD4mI3cu8d3zyu2SvS4AKkGJ0T
+0I41fZSFwEvXtnBmvO/hEt6ERUIy0yDUOKwsHM+y1f4PbrmrHkra1YR6ymMaDSO1
+UzyA5uyo0vXWw2myEBXoFrYe9sXqemP0/NP3DQ0QJneD1r0KxK60QH+zmKpKZqi3
+fYyXTLggTHYFC2yIhGHMmwgBlLDBkqAHnhsMTLBfAFtdWvI/HQBnhJWYYMAOy41a
+b/wVuND+6VVtKdmENV0KlhEFhENkZNS4tEZ6pqBWGIKJzZ6UP9jCicUMnwk9eY68
+3EeoN/uBS6nfVMD1e7kan8/aoatA4T6SmOCSwOyh0PCKvKY0fHJsODZJm2vMmJ5C
+NiU0IN80DaICaKOvxCVtjx01HSrzftaHi+bv1ZzguSLb/PaUxK5chyRPKeF7MN0X
+nX3JmJdW3yyu8W6qY8ZKEOKt7rXoG0YcGGrcHPbuSrNBGSQWypIB2U5+rDdrOQu8
+ffhvvjrKRSV013YA4Hl0Ooi/lsgFp0nzKfhgOoHONOSoFabt9KAbUlptw16EHD+S
+Hca+AA/kUYOFm9Ga4OJuitHliv9/UsKvf638HUH98rfJXLsgw4En9lfDaa4kaRIe
+MOY1y9HF5GOLuKBei9KZ
+=gjYr
 -----END PGP SIGNATURE-----
diff --git a/net-libs/iojs/iojs-2.1.0.ebuild b/net-libs/iojs/iojs-2.1.0.ebuild
new file mode 100644
index 000000000000..f24633e70d83
--- /dev/null
+++ b/net-libs/iojs/iojs-2.1.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-2.1.0.ebuild,v 1.1 2015/05/26 10:18:33 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bundled-libs debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+	${PYTHON_DEPS}
+	!bundled-libs? (
+		>=net-libs/http-parser-2.5
+		>=dev-libs/libuv-1.5.0
+		>=dev-libs/openssl-1.0.2a[-bindist]
+	)"
+DEPEND="${RDEPEND}
+	!!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	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
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1 # Verbose build
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# http://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 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
+}
+
+src_configure() {
+	local myconf=()
+	local myarch=""
+	use bundled-libs || myconf+=( --shared-openssl --shared-libuv --shared-http-parser --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
+		x86) myarch="ia32";;
+		amd64) myarch="x64";;
+		x32) myarch="x32";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		*) die "Unrecognized ARCH ${ARCH}";;
+	esac
+
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-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="${ED}" PREFIX=/usr
+	use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+	rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+	find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+	# set up a symlink structure that npm 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
+
+	pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	declare -xl TESTTYPE="${BUILDTYPE}"
+	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+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 ""
+	einfo "node-gyp --nodedir /usr/include/node <command>"
+}