Fixes to make npm etc. work better, thanks to jbergstroem

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 170 insertions, 18 deletions

diff --git a/net-libs/nodejs/ChangeLog b/net-libs/nodejs/ChangeLog
index 115aad753352..80317e322ad1 100644
--- a/net-libs/nodejs/ChangeLog
+++ b/net-libs/nodejs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/nodejs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.51 2012/07/30 02:18:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.52 2012/07/30 07:56:39 patrick Exp $
+
+*nodejs-0.9.0-r1 (30 Jul 2012)
+*nodejs-0.8.4-r1 (30 Jul 2012)
+
+  30 Jul 2012; Patrick Lauer <patrick@gentoo.org> +nodejs-0.8.4-r1.ebuild,
+  +nodejs-0.9.0-r1.ebuild, nodejs-0.8.4.ebuild:
+  Fixes to make npm etc. work better, thanks to jbergstroem
 
 *nodejs-0.9.0 (30 Jul 2012)
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0f2ac85a53a3..dc2c91fadde8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,7 +5,9 @@ DIST node-v0.8.4.tar.gz 11840649 SHA256 d0a3b0d2028ddd6bbaab5d3fe38dd6f80d7e810f
 DIST node-v0.9.0.tar.gz 11827167 SHA256 4d2e5d7c8b345f6e401eed7d06b4bbc6cb012aefc34b46e7c3aedb4a0fccd258 SHA512 25806ef23cd0bd2854e40502759182ec0e6462ed9cec3462cd5e0888df1c315725791900f925c23cc6c9f470a8632b811c24522b50df7d5c16e5a439c4b56a14 WHIRLPOOL 574aecbc5ceb43cb3ea5f6bc54824f884401a4f7b3e11399fbaea5d620e156922d22c6a9474ab0f65933e672c9734fbeb3ce1ed96c4240c1ffc3aac6ea2087e4
 EBUILD nodejs-0.8.2.ebuild 2361 SHA256 8c25650cf3271620fb508978ce9b2117b2bb11f17c67a8e67f6a3fa4aefc5df4 SHA512 4e480e899b96e12fba4e9c7ce7933fe9506d3f99ac7186ae999297419483b0a04fe6f96aebfbd57b0e7acd2d9ac23d9029082ce3008fc46a8635298785248606 WHIRLPOOL b0be6cf34a8036af53d4aded277ef0a7f3f98d4fcbe6602f56176cdedc73eed0e0d1eb90f5a34f9366ce5b6bdf49314133413db4fb2d34c788562cc88a52576a
 EBUILD nodejs-0.8.3.ebuild 2361 SHA256 d6b5b9e4ef530c807b0cdf20668fb6228ec4ef547f58437694b995ea9d5a9341 SHA512 1951fd4e713cb3b5fb2ef775ec4b9210b5103b68a288c2135d9d531e07c1974afd70388c2f099ee8e5a88543713f573a9cc8e3e2688bbc0a2b4c41c525257519 WHIRLPOOL 0b08ff2a5005d4c4989b0568b016ef943b074b30f10e7eb77b54498bfe65ca5c6c42021387bb0dd08989d74a019717506e883c651286c7a89a695255ee0c2061
-EBUILD nodejs-0.8.4.ebuild 2361 SHA256 a9cc72e7d71831321e08aa4cd670e527308c2477833291d45caea92b8417b42d SHA512 d104c74c6d88514d5ccada1462a56b083c24891be06acf18c36f0ecfa0fc0a8fb6fc368133e403e471b74c16941f5f2779a713f492b9fb3bcb3be1ea351f3a72 WHIRLPOOL 1148c7d5ff9619a455220484078a7251281fe78710a1fd1255c47845b8616f3c334f266eb143bb2cc882e128f247662ba13a4e93dc312c985aa42bd69bf0132e
+EBUILD nodejs-0.8.4-r1.ebuild 2294 SHA256 85bf5ac4aca7ee2374f66659cc5637a51c3130e65ac91b1c8df59258d8f446c0 SHA512 733481185e5308526688c233c13b3d6bde8a30f5cab19cb61f70de0c2aa3acc44fd4c16c2df488ce1b2d9d7bba2f8ba86f72b6e2bce0fa712fb679e4eaaebc7e WHIRLPOOL 98edbbd13f4da829e40ed1ad167b35654b710c9deb013845adc98a02e4783cf94db2ecc958f0d1b94b478b37d246ff1d5b2b417a229865bef423e89e69f555e1
+EBUILD nodejs-0.8.4.ebuild 2291 SHA256 9b0c5bf90e221ebdcbd8aee0b6a5e6d50cbab6b13f4a63d0c0bfdd62fa0bf4f8 SHA512 614b739af4221fa1627ceb52a5a953dca7d4811f87a51271fe5cafd5b6e1ee8e30db794b88c35d7e06b84cb47be5535336398d4e502f2d792fc1b0811cfdde99 WHIRLPOOL ff46a8a1d0379426a18d46e8119dbbae7e142e385099492dfe249e15888f476b5de48758c26f05f2861d09d26abc0d4a1fbf9cdf65edb96678108a36703c9ef8
+EBUILD nodejs-0.9.0-r1.ebuild 2294 SHA256 fe7e48d48a1f06c1628f7cc687aca55a4eee2e6c426f6fd0aedb6dee5c23fef3 SHA512 32dc06efb8af2b736d9d506f6e55d99c6a0444412c1f4db6956ff10ff05bc48bd8dcd6cdcb6f5c3419d726f058cd8e1ccc60d29fe2331c0bc2e8aa2ad85ca375 WHIRLPOOL 52125eaf0e329a25bdb38bd6b772ac2bc68568cdee247cc62025ddac5b6df0c34d65c82d91f9556ea398888b03863c59f4aaf17b71b79a624c0524f70e52152e
 EBUILD nodejs-0.9.0.ebuild 2361 SHA256 66a2941016a83957b2f0d8b5d5e6d67e1f995762d7a7c2a1a46681d9e1354e71 SHA512 7ea2ca6f107daec9783978a59a804c7a1097cb0e2440f5e3ec96a00f61751dd8ee8a79e04e07daf3b59980daea46065235f77fff27698a97b89651d6f37e2200 WHIRLPOOL 414479258520d72dcaa5fc63c995bd4802de58808530205a4df095bd0bfd04d44fa387123cb5fee7ac10d4b020e422b69d3d83b75904d438239155aab9867122
-MISC ChangeLog 7920 SHA256 c3a2ef96da00b912b23be153f85e7537457c69dcc68960cc3089c78b2bb43363 SHA512 55647f34233771c687ce1179f0bbf0b68305bed36bc8ad41314044e34af5cc4941b418975670e8102d53b2ed487b8bd74c1f619f810e5abbb0180e49e1f9b2b4 WHIRLPOOL 9fac3aa638bb920092cb9cebce0d47a25494140805ef3906cdcec5d011988c6770b89d7144fde316f3d480d5979566d44e6c7ecfc24044c89d80d53c9a0936e4
+MISC ChangeLog 8167 SHA256 43cfda3efee8a8c225be07011faa665ee1e75c129dc7e7628c1bcaad5bed8352 SHA512 c1f6ff3e1738e77d088369af5e7ae894aece3404835202c153bc6fa255444ed2267604424e345130aaf860cee1d0249dfc6bdbd50cd73aecb3a87af769abdc9f WHIRLPOOL c7248605acdd4eeb5cc952ee35cb0b4b52430dfa5e8764c4eff42c6d283ee83dc56ff39e27eba5936e9dc675b807ec62225baf2fad4d583fe73eafdef83f9f7f
 MISC metadata.xml 328 SHA256 ad2c212a575c70f52ed8075ccc5ceca143c69b933e94a0e14db5b81c2af09a0d SHA512 d5fa8369aecf7b97778fd8b9dd0e44ff8bb987294a198698323a4bda8816e86609cb6d807e5a4eaeec68c659bc17c88c69b9245f566bf224310c13812bfa55d3 WHIRLPOOL 01f6230ada1f1faf314fb64fad1fc73ab153847da2092df4101d259aa5352021cffcc7ffceb81e1d1df31fccfdb4b791a2ae6aceb3a1d6f1561b74ff3fed4df4
diff --git a/net-libs/nodejs/nodejs-0.8.4-r1.ebuild b/net-libs/nodejs/nodejs-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..cb3ed3689aee
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.8.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4-r1.ebuild,v 1.1 2012/07/30 07:56:39 patrick Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit python eutils multilib pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.11.10
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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
+	# Hardcoded braindamage extraction helper
+	#sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die
+	python_convert_shebangs 2 tools/node-waf || die
+}
+
+src_configure() {
+	# this is an autotools lookalike confuserator
+	./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	local MYLIB=$(get_libdir)
+	mkdir -p "${ED}"/usr/include/node
+	mkdir -p "${ED}"/usr/bin
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node
+	cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+	cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
+	cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff"
+	cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff"
+
+	# now add some extra stupid just because we can
+	# needs to be a symlink because of hardcoded paths ... no es bueno!
+	dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	emake test || die
+}
diff --git a/net-libs/nodejs/nodejs-0.8.4.ebuild b/net-libs/nodejs/nodejs-0.8.4.ebuild
index ccdecb014eff..66ded7c55961 100644
--- a/net-libs/nodejs/nodejs-0.8.4.ebuild
+++ b/net-libs/nodejs/nodejs-0.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild,v 1.1 2012/07/27 03:12:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild,v 1.2 2012/07/30 07:56:39 patrick Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="2"
 
-inherit python eutils pax-utils
+inherit python eutils multilib pax-utils
 
 # omgwtf
 RESTRICT="test"
@@ -36,7 +36,8 @@ src_prepare() {
 	# http://code.google.com/p/gyp/issues/detail?id=260
 	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
 	# Hardcoded braindamage extraction helper
-	sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die
+	#sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die
+	python_convert_shebangs 2 tools/node-waf || die
 }
 
 src_configure() {
@@ -49,25 +50,21 @@ src_compile() {
 }
 
 src_install() {
-	# there are no words to describe the epic idiocy of ...
-	# NOT using make but a JavaScript thingy to try to install things ... to the wrong place
-	# WHY U NO MAEK SENSE?!
-	#emake DESTDIR="${D}" install || die
-
+	local MYLIB=$(get_libdir)
 	mkdir -p "${ED}"/usr/include/node
 	mkdir -p "${ED}"/usr/bin
-	mkdir -p "${ED}"/lib/node_modules/npm
-	mkdir -p "${ED}"/lib/node
-	cp 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
-	cp 'deps/uv/include/ares.h' 'deps/uv/include/ares_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node
+	cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
 	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
-	cp -R deps/npm/* "${ED}"/lib/node_modules/npm || die "Failed to copy stuff"
-	cp -R tools/wafadmin "${ED}"/lib/node/ || die "Failed to copy stuff"
+	cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
+	cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff"
 	cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff"
 
 	# now add some extra stupid just because we can
 	# needs to be a symlink because of hardcoded paths ... no es bueno!
-	dosym /lib/node_modules/npm/bin/npm-cli.js /bin/npm
+	dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
 	pax-mark -m "${ED}"/usr/bin/node
 }
 
diff --git a/net-libs/nodejs/nodejs-0.9.0-r1.ebuild b/net-libs/nodejs/nodejs-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..02ba8ea638a7
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.9.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.9.0-r1.ebuild,v 1.1 2012/07/30 07:56:39 patrick Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit python eutils multilib pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.11.10
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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
+	# Hardcoded braindamage extraction helper
+	#sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die
+	python_convert_shebangs 2 tools/node-waf || die
+}
+
+src_configure() {
+	# this is an autotools lookalike confuserator
+	./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	local MYLIB=$(get_libdir)
+	mkdir -p "${ED}"/usr/include/node
+	mkdir -p "${ED}"/usr/bin
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node
+	cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+	cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
+	cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff"
+	cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff"
+
+	# now add some extra stupid just because we can
+	# needs to be a symlink because of hardcoded paths ... no es bueno!
+	dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	emake test || die
+}