Disable dtrace support (can't assume it's there) and fix installation for Prefix

Package-Manager: portage-2.2.01.21890-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 27 insertions, 10 deletions

diff --git a/net-libs/nodejs/ChangeLog b/net-libs/nodejs/ChangeLog
index 8537e194eb4f..a397ccac5aa2 100644
--- a/net-libs/nodejs/ChangeLog
+++ b/net-libs/nodejs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/nodejs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.83 2013/04/24 02:26:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.84 2013/04/27 15:17:39 grobian Exp $
+
+  27 Apr 2013; Fabian Groffen <grobian@gentoo.org> nodejs-0.10.5.ebuild,
+  nodejs-0.11.0.ebuild:
+  Disable dtrace support (can't assume it's there) and fix installation for
+  Prefix
 
 *nodejs-0.10.5 (24 Apr 2013)
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a0c87ccaccac..78baad652d9e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nodejs-v8-3.5.patch 440 SHA256 e27140ed4fb2d9db928c8a8138b53461eea352261265f9953c821ca15dfdd91f SHA512 9652a8dd423a3a067822e830f5b01667780c69232e4827c02a92ccc42049418efa65aaa6abe0fe301c968b7d016816d5fda08641fd7022dcde5620870aadecd7 WHIRLPOOL ce6dd29ea6c20eeabd239d65fd1154d7ac0cb83a0b71af733526b258ec43d81a16878480e54cb69e1e8afbc46405c352b590861f8ba347cb0516bf2f027652b4
 DIST node-v0.10.4.tar.gz 13246857 SHA256 1c960d2822447a9e4f7c46b832ff05e86743033c6643d644975af1cbf6a44fb8 SHA512 ba29e0799e96c0cb1c359645bca07144eb919ae964a94e05957e82e79f515d13f5817afb21226939f49960f41c9a10fbe889d00365d15e6864eec8d1139a3790 WHIRLPOOL 0020b71808ba85637ae6297edf63f1cbc73ca37e30ca926a6cbbf2f18ea34cafcd068d7e520cd2f427e8d2d0c9e55c72e873fcbf078be6bc8785850b035b64fa
 DIST node-v0.10.5.tar.gz 13250913 SHA256 1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd SHA512 bc79dec6f0a139062490b18adf0985f4e70f8d6f6476c53443ef9e312a7aef4ded679680f6d33d1aecda23e7802d2fa2fd8130b62e4889c70ff4f46a34909ceb WHIRLPOOL ebf78cbb2497ff355a5d2b7f18292c2cbd2c04baa00f81c48294254369f8b33f08095d91745a037e6fcba5353eb8d5781f37863f7bfc9488e98aab44355812ab
@@ -5,9 +8,16 @@ DIST node-v0.11.0.tar.gz 12956118 SHA256 a1887957fd6f0091379d1317f1daeb791bbf430
 DIST node-v0.8.21.tar.gz 12191813 SHA256 e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6 SHA512 10a305d5d798703144a4d4a29878b261be516f29a0bfe349e73879b81e16db89a6fabfce43a6b1abef2f085aa2cf884bde310b9feeb377083c43f674492f5d99 WHIRLPOOL f44085bb6710289adc85653f39073d17527bbe2bd27d9a998376a3eeab9fea462fb8f9d0f3baab4bda28d3046d3920a58ab14cfaa9eb1d20bb66cfdc1c71cc72
 DIST node-v0.8.23.tar.gz 12630347 SHA256 382432638aedc25495e655dda338adcf41c6fa1d35f355936d659784c1deed9d SHA512 d5dbd3eebf8c1b09af4ff437f2368ffaeb4db6127d99893db6181d39e3f5b176f1ec39519ed0fe536f4fce75852c149792a89fcb0947331969ce40a2503039b4 WHIRLPOOL 14a47c9ba868312ed3f2e61a69d03b841da385fc059c0706d05a0430721fdbb7581e398d495cdc4fe3050670295e448e9c6eeeaa80b01b2e9c6aa0120b6d7e3a
 EBUILD nodejs-0.10.4.ebuild 1653 SHA256 7f8ec01f7d9bcf4a4bffa59f3ca9156d3b32a7646efe2a20111a9e763865d220 SHA512 3723298a2503c755d927176507e0e3866e998e04844b620d003322a8eedae868dbe74e893f929af64e8ef94941e168efbaf0134d7767c515eb4928eed1a64043 WHIRLPOOL 5fbc6c8705b788e5126ea82c68e098f78cf7046eb19359882cc354a6865c054289303464b09146b6f3eacc9fd76bcea9f53e5b424510f6a6d6d5ea2775644606
-EBUILD nodejs-0.10.5.ebuild 1653 SHA256 d54505ef5c1f6831a8ef58d0031bef77f978349bd7fdb50b435dc9c74b4dd594 SHA512 1202a039252f23cec7441da87f2f4db6c05a7b4de8d132bf6432ed93c8d39e757e21cb8ba25f346f9bd8a7e4cf25f219598fd1fdd20faa605eb5c4cb183ef766 WHIRLPOOL 7cb1ef3a1ae43d35875bc50ac4c3194c051b671039f09829c858533d8eb64d15f00e1bcf49777be497a7d47ad7ef11900da7d4e90070a89336ce4e970ced1f1a
-EBUILD nodejs-0.11.0.ebuild 1653 SHA256 605dfa7410600dcc24b5a5640007f5dd327c20595eccb975df43e7b72cdf51fa SHA512 9e62fd15f8843bb164e0035d6c1d0108be7efd056212622082658b0e4f144bfb215cd3b1c6e6465dd309463b0d3b2b1f9c7fb2231689fc55b6a45a65b50026c6 WHIRLPOOL 7f9e47dc114326837177b7856df23c761b1d3b1a68802639033ff6a19abf24c52a238d62d37de70e18be3ecd4e102b3c6a2675fcf07620580b04aa2fcdce6739
+EBUILD nodejs-0.10.5.ebuild 1673 SHA256 0ca70aba39b651c875c99b03349fefeb0043158cb9d642d4a069b755e914d111 SHA512 418d36fdba4ca927241d87519b87d606dbc2467155786b96c3158f27fba939b0224e44fcfd6ca47181caa9273994c2828acf735a0ff5021edb8c22ac39225567 WHIRLPOOL 9b7bf8559d4fce778efb50a94627ea5d24fc5f1e7f7c75a7a46991aa312ef0c9f09ecd2d58ac0b0120d9a068bc8e9e62ccafff4b6f169eae9978e63a2ab0ff35
+EBUILD nodejs-0.11.0.ebuild 1673 SHA256 df37c1c5e4799521ee963d2eab0d0423616183da1f254b593742a554978b0906 SHA512 a278271203b357cd3c6c1cc7665aa628588faeea97f005eb1260f61a36a7332dff3977891938c6bd8135304727b76cb02bb66a9ddf127787479cff83b73655f6 WHIRLPOOL 6780bbec1b7547190441f8fc8fb05496689f9ada32565d64d9382960d417cb6e395dcf3edb3d51a6eac33ec7d5b984950db4727039e9f4877d16f80e73a2fe3d
 EBUILD nodejs-0.8.21.ebuild 2155 SHA256 f600f55eab3d7b5568380c95d554a684ba2bcd97349cd697312405a22d413a49 SHA512 7487de98b46e937ab478581a5319e77577621752fe6432c7e31db8021724d2d1053335f7ee83fadcd34462de015185706a8fe98e86358b2000f51e2981f159f3 WHIRLPOOL 0b47604c7a3f85ad6a52d5fbd72d65cff7ae9492fe2aa298a63d83679beaddd01c7e76f9de7d5ae9f0cffa80364e4704bae226c3c923585fe3cafedae8620370
 EBUILD nodejs-0.8.23.ebuild 2155 SHA256 cbacd75e39d13e786a6e9a96bd6d1e397cd3ba70b20a6622df6fa87b2c851af3 SHA512 b3560d497b1fda46a193aa5137b7907aa438b5c135307c61de0ebb8005836da82d68560873f3d6e1a0aaa4a9d91e6c6f3ba8e7432d2730ef7eeda8c0fbab3694 WHIRLPOOL 364c3908ecdf787502473b8e6e7aced8e20c56e2be000add6800c93ea2229de072f1915ab5bf1e9159204f00c0c236be88b0f81061a4753b64f09631e900a568
-MISC ChangeLog 13254 SHA256 122c6e29cf0c155d5bc9e239c268ef3f8951526881edd68a95af71ee7fc594cd SHA512 afb309384748c006d82b284a74ba48e4e60fe54d7ebbf127720760a1e6f0b57c816477684ad18a23ed44a5b4ee6cad68152c2b9db1e8e3fae49cc42e1a8897ee WHIRLPOOL 542c6378a54c353b1cb876a353e67a34a8c3ab4bfc0ba64e9909051cff63f33d0c2466b145f3215882638fb17c7db5ea12d1089144e81f7a6a4ee27829675235
+MISC ChangeLog 13437 SHA256 ac8292e9da40a0924d5a79ab6aff1e8e4778c8818026284bf46277d03e102472 SHA512 bd8870c8c57370300350e6673f1a7ef7ba8b7c1deb5e8f81a4df79e5b9d93ae2d80856fae292e29f45d98ad3fe00f890ff6e6e7e6c66f1289ed42a971674b6e8 WHIRLPOOL d8f742fa053f2baac08a11b62a55b695b719810c7d6ffc3fcf6a520dda3d58352a2e832ef0610ade47dd5f0dd1de007579c66ad1d183732c0e67410e0bfd54ba
 MISC metadata.xml 360 SHA256 bb6c4fcc5207394662163163ff6d881870c7747547d4fa93ef6d451b6e2303cc SHA512 4d676a3a82a56ab6588a8ad563f8f7d67bccd4ef946e2e844b57df614678114d8c5601578b585f120370c65f6fd43c1629cc34f2ba5ad803d6e2301d289af510 WHIRLPOOL 8f0981d01814988137dbdb540c6902c4b4b2abdcd719a2ff02d7ee43d8a5af03781197e6e4cdab7e4f4ca59e75d294fcd78a472ff582f944a2455c6e76ae356d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (Darwin)
+
+iEYEAREIAAYFAlF77BQACgkQX3X2B8XHTonqoQCfXRuWOr0uFi4u/4SV/DPvlHKb
+NWcAn1hIVnW176Au+B6Xr2sZ6UnAbAPn
+=RpEU
+-----END PGP SIGNATURE-----
diff --git a/net-libs/nodejs/nodejs-0.10.5.ebuild b/net-libs/nodejs/nodejs-0.10.5.ebuild
index 94a90da905a5..015dfac3a2a1 100644
--- a/net-libs/nodejs/nodejs-0.10.5.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.5.ebuild,v 1.1 2013/04/24 02:26:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.5.ebuild,v 1.2 2013/04/27 15:17:39 grobian Exp $
 
 EAPI=5
 
@@ -39,7 +39,8 @@ src_prepare() {
 }
 
 src_configure() {
-	"${PYTHON}" configure --prefix="${EPREFIX}"/usr --openssl-use-sys --shared-zlib || die
+	"${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+		--openssl-use-sys --shared-zlib --without-dtrace || die
 }
 
 src_compile() {
@@ -50,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	"${PYTHON}" tools/install.py install "${ED}"
+	"${PYTHON}" tools/install.py install "${D}"
 
 	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
diff --git a/net-libs/nodejs/nodejs-0.11.0.ebuild b/net-libs/nodejs/nodejs-0.11.0.ebuild
index 91954c3d04ed..4a5c4fe2bb9e 100644
--- a/net-libs/nodejs/nodejs-0.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.11.0.ebuild,v 1.1 2013/04/09 04:02:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.11.0.ebuild,v 1.2 2013/04/27 15:17:39 grobian Exp $
 
 EAPI=5
 
@@ -39,7 +39,8 @@ src_prepare() {
 }
 
 src_configure() {
-	"${PYTHON}" configure --prefix="${EPREFIX}"/usr --openssl-use-sys --shared-zlib || die
+	"${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+		--openssl-use-sys --shared-zlib --without-dtrace || die
 }
 
 src_compile() {
@@ -50,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	"${PYTHON}" tools/install.py install "${ED}"
+	"${PYTHON}" tools/install.py install "${D}"
 
 	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