Small fixes and unbundling for 0.11

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

3 files changed, 104 insertions, 2 deletions

diff --git a/net-libs/nodejs/ChangeLog b/net-libs/nodejs/ChangeLog
index 75b94ea8d529..cd790284e7e8 100644
--- a/net-libs/nodejs/ChangeLog
+++ b/net-libs/nodejs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/nodejs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.122 2014/07/23 03:41:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.123 2014/07/23 03:51:35 patrick Exp $
+
+*nodejs-0.11.13-r1 (23 Jul 2014)
+
+  23 Jul 2014; Patrick Lauer <patrick@gentoo.org> +nodejs-0.11.13-r1.ebuild:
+  Small fixes and unbundling for 0.11
 
 *nodejs-0.10.29-r1 (23 Jul 2014)
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a753aab1b2bc..474b725e2f9a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -11,8 +11,9 @@ EBUILD nodejs-0.10.28.ebuild 1798 SHA256 a15899d2fa78d696280774e9fd8d951fb1a356c
 EBUILD nodejs-0.10.29-r1.ebuild 1872 SHA256 b27d829bb0e9dee83b2615a89c1c5e404d235960a0d3d6ff96cdc2519aee2ff1 SHA512 33d00e18a8fafb9006bf50c6ffbf338f6810a47f840fb24b42ef1ed429f7d9dfe65ead9330c1cba3a9fdf7b75b8190dbdb41976f8aa3948868613260fc8dd1e9 WHIRLPOOL fee85619f1d091de01bc4c21aed64eff134f531608e140dc6fa9142e2d9bcc730d159734da515bf2e0635da9d0790955df0911ad179b0460d4c93dde96d5c84e
 EBUILD nodejs-0.10.29.ebuild 1814 SHA256 080c0780d471a273ff6583a0d8126c0877046be18e37df8d77dbe45b47df6f15 SHA512 c68c9c2d97f03381bcbf186c75e31520c567360b2c9b3f073bae0cd271a0c627b513a7013a434b4f35160a3fa4409f5ebda16b61346debc9de050dee570e6dde WHIRLPOOL e3152b01e48e30963992ef91de82e08c988f3ea1f143a22fc10b3427e06962a371ae3c1122aac30864f2d18f3ff4a981d68233b69334d0d45e47d4adf3857351
 EBUILD nodejs-0.11.12.ebuild 2140 SHA256 053b4eedea2813fcdd68ed6d74b8dd0746b2ea859067590f7201e0f61ad6807c SHA512 1f7abea2987bfbf677a4df7c35d4a7677bb0e200075e3729f654b5af4e3063744762fad8b6e0c4f0b006d23bef9bc187c6597624a59b5583b0e29e480402e885 WHIRLPOOL f52c7262a8fda1b5bd44225bb89974017992871522e79670b2d45a8116d85047101de34d4d66a23f2592b2e01a593c99ed5cbbcec953e73b3c5f2c0b5b0fa4c7
+EBUILD nodejs-0.11.13-r1.ebuild 2322 SHA256 3e5437164deb31dc1d7a4b5d4235f7a044fc198689c712820e13e8282ae6bc56 SHA512 d2370a8347c35d4b2522fc19e295e2e628236f92eb558e2ac6d6f56f608b41235fb5ce7336411d88bf08a685c25fa70104d0fbb8e6d8b58d2ad267f3bb67ba00 WHIRLPOOL 2b7fd91c10fe371b96333b0301244d5c491c5963028560f6526d5b176415f495fcf9da0a73f7b342e46f5b96a160caef0bf5ee6811b4356cea34a1f950f41254
 EBUILD nodejs-0.11.13.ebuild 2156 SHA256 9823b409618cf73d9b009bc8109144ccc3044bb15da2a49b1d1c672174b5eaec SHA512 b3e0445b5774b282b465275727e7bf3df1cfb6d7f487030e44ea7e0f29b8e928c8999aade574e30fcaf809104f73523e905c6e4aff092ab3ac74e680d9f5e1f2 WHIRLPOOL ae8f9131e1165c9f09528a29af18b5b9d90e9fb1b23454b1b93726315309845cb23c5569718aed9ad8b1a37cccf0ec3bf04929a425bd74d92a7e270eb308bbeb
 EBUILD nodejs-0.8.26.ebuild 2155 SHA256 e1233364134139f69479f4edeccd5343efff92249ebaba73afe969b1d0ab5244 SHA512 6dec2c0ed429468a8df1c735bcfefe38d038fab797e6ca8bab6dae31e56bb1f05549357978d7bee0c0f29c5e7e15453253075aff9124d1ae25de57ca609b2362 WHIRLPOOL 3527ad09117c1811f838d792bf673548162ad69db5c3a7c41f7d0bffa4d40d6835ba734103c1670bbf5c58b014e9ac63ca0d39327400ebaa2fa5fff257730bd8
 EBUILD nodejs-0.8.27.ebuild 2171 SHA256 be9963d99792a3cce58f2c65291112e352a29c4436da964ff5b289744ed8cb40 SHA512 c6b1dcf6eefd6db0c856002b1362cbd0040b74fe4368d1d433c33627d667478764f3497a47c68740f27cc720e2bed278a2d172f4a87dcbc1e29cd095c076b9ac WHIRLPOOL fbdeae39affc416b3206947c948556cd6da034c0a5a30b272633cb532f3e8e74011e1421b9ef8373dc666edad89250a37ca416e5f91704b82050b8241e6c146e
-MISC ChangeLog 19251 SHA256 3824e0c7a4ae1f0e5e641ddc8008ae9f22b4814e2335c75917dc7029494ac576 SHA512 50ca268b0399341eab8850f783e6072c15cdd38b8b1ee24ef20a4cb4d3c581eb5157def65b7c78653ee2e7bac0c69e1de034ea130a7ede7b7f7a092c2ca5f1e7 WHIRLPOOL fed4ad8b2e2052debfcf13bb1af52b7aa99b7002c7e64e07513488bb99a0ac278caad719c014b222a456d89c8bd39fb94edd8622e9ebde6d083b28c2a48e9116
+MISC ChangeLog 19401 SHA256 74ffb494d3feec1d13d5bffba69a032771ff0d5ad4d9ea25ec9f1c3c97e8a037 SHA512 27faccef0678678b01a223e9b677c765fdc6c0ac4dc01bd7682bfe0b1eea3b52a96ee05b7efc185abc36bd520db541ebed97a6840d35f7a3ea299c2997ea6fd3 WHIRLPOOL d97b33321739f5ea537966eba7e5f3a394154d8403d8ff050a36aa5c4e79876f8d620d9949fcd30ac6e1bb8ee77b325931468c87e846f46bfbbc60c4b0d39cf2
 MISC metadata.xml 545 SHA256 ea98b41b3fe8288a7b38649098871f33c897916aaa34c718f8b849bc35d15c12 SHA512 f32b1eced5dada7827c10bb7b59986400d8dce58dc8c2c0b03d3acd0886b539d2c0afa7956c8a0d1b1ae1894eae31c520368c524bd4c7fb5930180fc8bc4b035 WHIRLPOOL f3fe5d3c70386787eae1cc856f7a57d775738096777074b50678f45ed7e5c9c2575c21a452e75d9a5d06245c85c17434593a7b3d0b5f0c4ec932fd3c7a8b84aa
diff --git a/net-libs/nodejs/nodejs-0.11.13-r1.ebuild b/net-libs/nodejs/nodejs-0.11.13-r1.ebuild
new file mode 100644
index 000000000000..8b2011c6d1d1
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.11.13-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.11.13-r1.ebuild,v 1.1 2014/07/23 03:51:35 patrick Exp $
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit python-any-r1 pax-utils toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+npm +snapshot"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	>=net-libs/http-parser-2.3
+	=dev-libs/libuv-0.11.25-r1"
+
+S=${WORKDIR}/node-v${PV}
+
+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
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	tc-export CC CXX
+}
+
+src_configure() {
+	local myconf=""
+	! use npm && myconf="--without-npm"
+	! use snapshot && myconf="${myconf} --without-snapshot"
+
+	# Use target arch detection logic, see v8-3.18 ebuilds
+	case ${CHOST} in
+		i?86-*)
+			myarch="ia32"
+			myconf+=" -Dv8_target_arch=ia32" ;;
+		x86_64-*)
+			if [[ $ABI = x86 ]] ; then
+				myarch="ia32"
+			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 \
+		--without-dtrace ${myconf} || die
+}
+
+src_compile() {
+	local V=1
+	export V
+	emake out/Makefile
+	emake -C out "mksnapshot.${myarch}"
+	pax-mark m "out/Release/mksnapshot.${myarch}"
+	emake
+}
+
+src_install() {
+	"${PYTHON}" tools/install.py install "${D}" /usr
+
+	use npm && dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
+	rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
+	rm -rf "${ED}"/usr/lib/dtrace
+
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	"${PYTHON}" tools/test.py --mode=release simple message || die
+}