Version bump with upstream fix for bug #552232. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/153 by jbergstroem.

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

3 files changed, 163 insertions, 16 deletions

diff --git a/net-libs/iojs/ChangeLog b/net-libs/iojs/ChangeLog
index 08064980655c..7b7068703a95 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.21 2015/06/15 11:53:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.22 2015/06/25 18:44:42 mgorny Exp $
+
+*iojs-2.3.1 (25 Jun 2015)
+
+  25 Jun 2015; Michał Górny <mgorny@gentoo.org> +iojs-2.3.1.ebuild:
+  Version bump with upstream fix for bug #552232. https://github.com/gentoo
+  /gentoo-portage-rsync-mirror/pull/153 by jbergstroem.
 
 *iojs-2.3.0 (15 Jun 2015)
 
diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest
index 0bd898c9ca4c..ae464d3224a1 100644
--- a/net-libs/iojs/Manifest
+++ b/net-libs/iojs/Manifest
@@ -19,6 +19,7 @@ DIST iojs-v2.0.2.tar.xz 11900380 SHA256 afab3752cf9143a13784cd9d9c38b0ff5fd4aa77
 DIST iojs-v2.1.0.tar.xz 11976228 SHA256 b9bb7fb626a0f0f0babb3b042f61eba55ff0dec4645682fbb36b5bab13d5dd29 SHA512 66c06f2482faf9be2585a718a144cbbaceca3498e823659147c2b8592b073a9b49afd9e708df5057a905fea13e65c3c421d537418fa2891345b76c65a486fc70 WHIRLPOOL 76c0a1ec5b820c3b97ec760ecdb79fd4bd782e3a9fd04c9cc289f1e9e6c6cf900bc3f041f135fed094c2634f8d37db4485257c25a1cfdd997b74f5e715ba9354
 DIST iojs-v2.2.1.tar.xz 11985012 SHA256 26cce6e3581185ef3b1fe486a86ba9e18d611f6dfe439cfcbcfc8e639436a5bd SHA512 6ca0e93b1c5ebb05213d19341bf60087d1b362537e6cfee216b2166e95fec7bb7b98b716d21bf0e51e28f27fb27b0c48ecd045c6b28c0d5d9a474a49e28dc7c5 WHIRLPOOL fb494b97f773fedc3a997b4ddfb66ee5ed51dfa9a4e1cf4cce15cc8e7639f850367f87037307955769049df68464c6194fc996b8bede28b7acae422b45dc159a
 DIST iojs-v2.3.0.tar.xz 12044508 SHA256 bca702877c2672151ee898992e8e88f07eb14c221bc261ed9613e1107e9b9a3e SHA512 628f94e6ba363b0e5c4945e83020c59455e0b5cdd1d5c72401298dca80dcd00d1593a044e3b61ad49de4ec0151ca310e70ce20cc560d95f19c67efef5fe78ba4 WHIRLPOOL 415b9056ea93a8ac26e0f2cf9248614cf1df50a75d710b644385a680684c7a45d71d675842a892f3acfd106895f0ab1d3f2694b0bee8357b9af2d31c6bdadac4
+DIST iojs-v2.3.1.tar.xz 12189880 SHA256 3e45929ff3d676ebf385f034566f02f9727c74b394d3dadf0b7cbfb3da6f5ab7 SHA512 feb7c46120ad4b4cdbee3f794a76bb868fea85d5576a38c63b248668838a56508c8323a213e0c63f889510be36c2e2b8fdc7d4764ebc0cd8451b66896e6ce693 WHIRLPOOL 4e1f0fc82542d435135c54cbfa138e1ceb14996db79f4f2b722feed4ab59cea06a0168740d931b746cafa08959fa9fb80716fd9a2159283c9030f9c7951c0ad9
 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
@@ -36,24 +37,25 @@ EBUILD iojs-2.0.2.ebuild 3871 SHA256 54a2749e976136b8bcff78e4904587484d2bdb83645
 EBUILD iojs-2.1.0.ebuild 4248 SHA256 d8d15cdc3940574a95ea5c92ae47aab85262cec4368f54b4863c39f1d943b62b SHA512 c7617921bb18ed4f462574dc27967a808467c3647ee5e4f534d5e1c21e7a82055fc777473385daf72f0955718ec47f24ba0397de9ca87a5fdae9bc66d42269a9 WHIRLPOOL ef41340a4921eaade607877e716cc3582b6c0b5922a3341466956c784dd693202228a010ed57c188bc57b9eb436cadddab10309dd27eae1118c2fd0fa3e60fab
 EBUILD iojs-2.2.1.ebuild 4248 SHA256 d5cd810157d530f60c9bdade303b7e964241209d93c770a362f66682d2de7b49 SHA512 930c96dafd1d9214880fc76586083be15159382f060926fb152b8840992d01c5887e34f5c1b035705b69b84db7ecc81fdc31b4cf33469e0364d8e4e1b832dc1d WHIRLPOOL 3aaab5654be9fd2569f6f82302f58fbfbd4c5a624c18385c1c020096f21318208b350833dac51fd1ab07d4c9cc7b37efc9eed555eb4aed537b387e5e62d63419
 EBUILD iojs-2.3.0.ebuild 4248 SHA256 193c01f6d44ac5f976b5d4dec16753c31872cdefc5ddf110d9d78cc3d4f5c815 SHA512 9f4e32c32b027721d54c5dc5741f3d7ce9b3859fab814f95c81fe25806919bc3fb1c92514fa56ef3004430e204be2291b3970ff5bb768cf219e674361c66dd63 WHIRLPOOL a1a2da5f8e008deaf498e376670b8dabfd8593804f8832420ba9eb5f899d65d5047204456bec98b44731b04e295bc289d4536d0f534c005c8352605f79ac2da0
-MISC ChangeLog 3528 SHA256 b1e4d4064a5ef8ec166c4e452fcf3b318ebcebff33d89a8b0a08987568c5a071 SHA512 4c4db92ce07c8ebf904c9e26d1f871fdf057dd595456f774876dbdf576c12add52f52e72a22420f598dd51591444af9baf88936ad8ecdf62478eed91db740a77 WHIRLPOOL 53f5213975f24923ef2324f02a3e9fd89df2488b06a8d5bb6599d186c0e178732a7914935a33cb3051820e7e878172870f6176d720d219dbc5a06559c51554d1
+EBUILD iojs-2.3.1.ebuild 4262 SHA256 8be044cfa34274e5fa8411769774942e2c1e1eef7bbbff4fbc5e9c41b5b6e28a SHA512 2a0a258660d9f27c38d30134a71b893e550ff9d25158e59c9412e1422511465c054c41955516dfe30bd7b6400537f579e46c234bc42b7545bbf5c14810175d46 WHIRLPOOL ffedf6ed8a9942943be2b55183c15fd92ab207d9546ec9a29032cc270d0dcb6188281b26592b0f10d33bbb54ffdd47062e4a8aa560499872c844284ad588f012
+MISC ChangeLog 3758 SHA256 a21315867b3e56326bce681e3a5e35b5b17e4aa596ecd1cc2546726893c83532 SHA512 6f151e5fc7a92bf03735513b1fe45ca7111918a08dedaa8385c4f53cf6a6df7133eaadecd0739442c6bd59bd01225036a0624ece98ab4430e12da1fece9dc47c WHIRLPOOL 72e4a8f71154be6249b7b10f376d894de3154ce6388b627bc70b9ddba353d163d973c55bad5c0b6349ce8d026a8c3c4af4a24f7cb5003fffad12c56e18c263d5
 MISC metadata.xml 945 SHA256 df3d5c5619158cca7f6b52111bb8c7d42ffc231061389c134984dfe7771f98e1 SHA512 ba2ae70644d857bed881e0fa67a2ce2a5741fe2e72d585c12bf81ec2ba42e414a76acae2601ccec0359fc700e5a275899c0212ed7a3079eec0da0a87a1d274a5 WHIRLPOOL 466a076e90fa6e2f9b0a802b3114ebaedd512ba735abdb0792948550c8fadbeea803c1f962efe631480141f23a034c3d3fc0aa9619ddb38b404136c885230841
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVfry1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVjEwbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOH98QAK+uIqXHWFuPv4yhX/ADg96j
-h+1vSne6keodDxyOudppEJmJZuWgcjnMNFB2OL9kDfjUptcW8XRG1nSfcWG2/bgD
-ZD0Vvk0Lfv2D9bWtOumbP8Ct8z9AfmF/1p1iLUSTRdOqvkijdjGeSFVih7l00wfP
-mSUsSg4S/LWfXpfEv91115dwvm1AO5lFh4b4elk7esWhHNHm3Kx4awHNd3gMG0mm
-M32pqMZBk9xkrkKpeQ29qjHyojjJCERVMYHqIWsA4z+9j8BPDQYipuRa1Loo6uqN
-JMOVwMDGzVc5IsyUYOCI35oYC2UZC+lDhEdWcdQSxKR7vAhryykvR8ltGN4FkJSN
-CvgHwvgQ04fU3/ArLrU0Q5WxHEv0DUFmq7U68epsHyg3K7SMhe+tlaSNGmSB76df
-DnRL35FFJMxfR9+63ZQa+au09hJc4W6oixkkrkEY3DmGR91JliUrNAuXiSoRR8kt
-4Km7v/+Djn/dfmsi6NSETmFZxYbAnobtf3PV7xG55CoLEgPKtTivUzmAeW8lMG/p
-5AiTm/1ZkHKAWRegSQe5cmeoXZzTM8N5xXKHjWWavglthBTVWXewhk2lKznsZ2/V
-mGwHMZLfYGfbozucl41MD78l+hJXmFigPEXKfvAQvWuzyBpf717SyEpdKJC5umho
-ljpNBR/luyux0FIlxG/2
-=rmTP
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgBsP/2RYU9aWqIMQMiDIQe7vn9Gn
+IeydHlYP5XyDnIWk3g4Egxr3WZ73b8MDJ/BPwFqRpoV9NJOxzcvLr7bFWAaod6kV
+pkJze//DfQSE7TM1+jL4JLYUIMagSH3RbzXtKwM+KaKxbDe5B8WJOIcResM2Wtlq
+VXT5JBNoMawsVloubXcYnZGzUrizsRAzEAzbccgsibDQdWDZXRdJmnUsyK1IrSFP
+A5oLd1qdux2NbKR9ei/CoeJ0J1cLlqihr6zedz1xIK0JE7vQYxdeF/lcZ9YbDAIi
+bJh0lWsgY4lPM1QE5Po3rg9vnEdSCk0SANo2JADSb4GzPZ9mIe7AjgtFIV/PNZrA
+5KA9D98w2W+L5V1wtoGjBP5fLuDJKyDpcs2j5A3lGp7PTErbPu0Hs/6S7/bEdZ5d
+GvREZO0TiHtfzXX3Ay24q+fdXH3GalUhzOT/jhmKiPaiSVIkX9mnAc8ygTwfIoGo
+9k2aOv1IDqgjlQOFjr3aCj0txDGsPC9HJQcfGaH9Ezt7Lpokt2gOOifluGbpBzmo
+t+03C4JIa9LSI3FEIbOnL4kgafTTzbwKJkuKvlvc9gAd+EboeMURjhdH6XUWrWP5
+p9voFxCLTBX5nFesxDFqUCG3lowvMrmnAlL+AoAv1GNlc/9M+cHZdIcPAW2jpSCJ
+5YAy/jihlkKxkHlWetFQ
+=P8rn
 -----END PGP SIGNATURE-----
diff --git a/net-libs/iojs/iojs-2.3.1.ebuild b/net-libs/iojs/iojs-2.3.1.ebuild
new file mode 100644
index 000000000000..8dd3e386af8f
--- /dev/null
+++ b/net-libs/iojs/iojs-2.3.1.ebuild
@@ -0,0 +1,139 @@
+# 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.3.1.ebuild,v 1.1 2015/06/25 18:44:42 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.6.1
+		>=dev-libs/openssl-1.0.2c[-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
+
+	epatch_user
+}
+
+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>"
+}