Fixes for test phase etc. by jbergstroem

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 124 insertions, 5 deletions

diff --git a/net-libs/iojs/ChangeLog b/net-libs/iojs/ChangeLog
index 3fdb87c98cb2..b6fd4883dff9 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.1 2015/01/27 03:01:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.2 2015/01/30 03:46:29 patrick Exp $
+
+*iojs-1.0.4-r1 (30 Jan 2015)
+
+  30 Jan 2015; Patrick Lauer <patrick@gentoo.org> +iojs-1.0.4-r1.ebuild,
+  iojs-1.0.4.ebuild:
+  Fixes for test phase etc. by jbergstroem
 
 *iojs-1.0.4 (27 Jan 2015)
 
diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest
index 54c7941db99c..49b7a9277ffb 100644
--- a/net-libs/iojs/Manifest
+++ b/net-libs/iojs/Manifest
@@ -1,4 +1,5 @@
 DIST iojs-v1.0.4.tar.xz 12284732 SHA256 c902f5abbd59c56346680f0b4a71056c51610847b9576acf83a9c210bf664e98 SHA512 0e3d4f66fc7f64e09f999b1fdb7bbbfe80a5cfd0396ec718bf166ae44bcb27eebf5b59c3cd4a74f050b59ee529678b1bdef1c3b9d71534c8ac0ab8caf8472021 WHIRLPOOL cfd766a513877f6ccfddc4e1eb4e0be4fa987dbac7c7c8159f70556b72a01b26fdd7d92be3fcb7efc37691b6808c8d570199741f01f95df77dd9aa95312bac9e
-EBUILD iojs-1.0.4.ebuild 2943 SHA256 419f60999115bcba3c4022d01fb5d3e3408e4fd7026cad9683424229d4567915 SHA512 8b9bd63c3e1eb28dcdd903cbfb5d64d9bd756efd5b839824b237b8545d5bd9d2c859e694a60b143490a4b70d32c83f297f1f4c881e1417fa9fd94b3cb6884de2 WHIRLPOOL 201359966ca2300fc950bb0e4e1e9b4427cbbb283495d6b5cfb9fbbc7c47bb0aa65bf22e6302f758ab925b1cb39e001f9c00c6e37cf803f1e83f0e7516f54e29
-MISC ChangeLog 354 SHA256 c794e7cc7cfe88b5108a62131d719cbbf33bf1bed7d5e765559bd30771e43399 SHA512 46f4ca26c1adf03d7a75335cf85ab4c79ebc9f82781d1813e2e2bb947760bbf295590b920310fb91c7c05320a693803b115c7d0635f13f40f8e5a2df8e1f0964 WHIRLPOOL 13e6dd7a3d3a17b42cc0c9643f3671e5e3ef6c7b1075d702b8d7136b496f95814d4fbf466de613afcc324c118f42f55082b5cc435d221000e74b4deba3a2136d
+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
+MISC ChangeLog 522 SHA256 2f3321ba334ae9d88daaf83e4085a73712333a13c426c9c2bd8b196ac5b77e34 SHA512 e6c8d13d03d025345ef1754adcc41b456b698e89f2a6e4e63179043a4b0cbf1ebd45be716bda1b602020443261c0ac1ed6570ed6c49d1b6eb70e33d30c198ee9 WHIRLPOOL a3ad0cbc8a406c1ced08b609315d6debd5c4d412c146fbb379c32cf7d3bc60b0430f0d0b229b637682902a759ef1a68ecaffe1f8c507847df94be6e24f81c2d4
 MISC metadata.xml 545 SHA256 ea98b41b3fe8288a7b38649098871f33c897916aaa34c718f8b849bc35d15c12 SHA512 f32b1eced5dada7827c10bb7b59986400d8dce58dc8c2c0b03d3acd0886b539d2c0afa7956c8a0d1b1ae1894eae31c520368c524bd4c7fb5930180fc8bc4b035 WHIRLPOOL f3fe5d3c70386787eae1cc856f7a57d775738096777074b50678f45ed7e5c9c2575c21a452e75d9a5d06245c85c17434593a7b3d0b5f0c4ec932fd3c7a8b84aa
diff --git a/net-libs/iojs/iojs-1.0.4-r1.ebuild b/net-libs/iojs/iojs-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..005a3575479e
--- /dev/null
+++ b/net-libs/iojs/iojs-1.0.4-r1.ebuild
@@ -0,0 +1,112 @@
+# 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-1.0.4-r1.ebuild,v 1.1 2015/01/30 03:46:29 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit python-any-r1 pax-utils toolchain-funcs flag-o-matic
+
+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="icu +npm snapshot"
+
+RDEPEND="!!net-libs/nodejs
+	>=dev-libs/openssl-1.0.1j"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	icu? ( dev-libs/icu )
+	>=net-libs/http-parser-2.4.1
+	>=dev-libs/libuv-1.2.1"
+
+S="${WORKDIR}/${MY_P}"
+
+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() {
+	# 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/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| 'python2'/" 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
+
+	tc-export CC CXX
+	export V=1
+}
+
+src_configure() {
+	local myconf=""
+	local myarch=""
+	! use npm && myconf="--without-npm"
+	use icu && myconf+=" --with-intl=system-icu"
+	use snapshot && myconf+=" --with-snapshot"
+
+	case ${CHOST} in
+		i?86-*)
+			myarch="ia32"
+			myconf+=" -Dv8_target_arch=ia32" ;;
+		x86_64-*)
+			if [[ $ABI = x86 ]]; then
+				myarch="ia32"
+			elif [[ $ABI = x32 ]]; then
+				myarch="x32"
+			else
+				myarch="x64"
+			fi ;;
+		arm*-*)
+			myarch="arm"
+			;;
+		*) die "Unrecognized CHOST: ${CHOST}"
+	esac
+
+	"${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+		--shared-openssl \
+		--shared-libuv \
+		--shared-http-parser \
+		--shared-zlib \
+		--dest-cpu=${myarch} \
+		--without-dtrace ${myconf} || die
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+
+	use npm && dohtml -r "${LIBDIR}"/node_modules/npm/html/*
+	rm -rf "${LIBDIR}"/node_modules/npm/{doc,html}
+	rm -rf "${LIBDIR}"/dtrace
+	find "${LIBDIR}"/node_modules -type f -name "LICENSE" -delete
+
+	pax-mark -m "${ED}"/usr/bin/iojs
+}
diff --git a/net-libs/iojs/iojs-1.0.4.ebuild b/net-libs/iojs/iojs-1.0.4.ebuild
index 197da738a49c..ced093afabcf 100644
--- a/net-libs/iojs/iojs-1.0.4.ebuild
+++ b/net-libs/iojs/iojs-1.0.4.ebuild
@@ -1,11 +1,11 @@
 # 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-1.0.4.ebuild,v 1.1 2015/01/27 03:01:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.0.4.ebuild,v 1.2 2015/01/30 03:46:29 patrick Exp $
 
 EAPI=5
 
 # Sigh, this can't work ... silly upstream
-RESTRICT="test"
+#RESTRICT="test"
 
 PYTHON_COMPAT=( python2_7 )