Fix compilation on Darwin, and fix for Prefix, use force for weird dependency problems which are not mine

Package-Manager: portage-2.2.01.20389-prefix/cvs/Darwin i386
RepoMan-Options: --force

3 files changed, 29 insertions, 14 deletions

diff --git a/net-libs/nodejs/ChangeLog b/net-libs/nodejs/ChangeLog
index c6c115fde8d1..5cbaef931220 100644
--- a/net-libs/nodejs/ChangeLog
+++ b/net-libs/nodejs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.36 2012/04/15 00:49:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.37 2012/04/22 15:01:32 grobian Exp $
+
+  22 Apr 2012; Fabian Groffen <grobian@gentoo.org> nodejs-0.7.7-r1.ebuild:
+  Fix compilation on Darwin, and fix for Prefix
 
 *nodejs-0.7.7-r1 (15 Apr 2012)
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 199a77523f8e..f49e64c9e975 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nodejs-v8-3.5.patch 440 RMD160 3acac03a96fa3c6365a076eb47b4c1bac12d5a2c SHA1 135a23be4458187b358d5edb3c5f46be92312c45 SHA256 e27140ed4fb2d9db928c8a8138b53461eea352261265f9953c821ca15dfdd91f
 DIST node-v0.6.14.tar.gz 10742747 RMD160 e4720eec19c3f1d80bd2bdc204cc48834f63d99a SHA1 84da327465a96c8fdfb58f351e877e417570a8fb SHA256 e41922308155c5197c2d048948ca9cd76ea5f9a51f977e1591bd93fe17d4cf1f
 DIST node-v0.6.15.tar.gz 10741691 RMD160 a1eda2fc6f9031787fab1f9d393038f2ecb46a87 SHA1 5c52d8f91f221277fe69d0e5bf73d13d0f23038f SHA256 78859a1a31c8e7a64d0efa040326d93c6624cc344d39b2e47e14e9c4dc3136e0
 DIST node-v0.7.7.tar.gz 10927479 RMD160 df2fa29d128806228f8014f15ebcde762cca4920 SHA1 b8c12343d8701a109046e3ee1d40836ff50ca51e SHA256 40d67cdaba5fdef522fc49e31220ffc3278c90cb5ca1dc5dbb6e43cbc938f8d1
 EBUILD nodejs-0.6.14.ebuild 1022 RMD160 48aa86b6a0fc151b3ac24b5342268373f8bb5bd8 SHA1 c56555cd89563bc746fd3bceae7d1fdccd10e95e SHA256 8364f070a69e3116b2ce0836632cabecdf1d321ea2e5fde8014d1b0389d67dbe
 EBUILD nodejs-0.6.15.ebuild 1022 RMD160 e5edcea2f4bb4cee900bf733089aba149d3231c9 SHA1 676eb153d1baebf0686afcec7d4ecb5338314b88 SHA256 392e7c2b4a1bcc5198d3ce7aa7c951d31767a19df7b7e10682f1d7f50e81ad57
-EBUILD nodejs-0.7.7-r1.ebuild 1961 RMD160 5bee85dcce1bcf4f465eabcddfaa29ebc120e899 SHA1 fea215adaecdf054382f1eb59b49db49f7f66128 SHA256 cc3cfd28f40e428c78a8433c8f8667ac62e052a7785e2bc977c4e232ab0c513b
-MISC ChangeLog 5927 RMD160 f100a31aaca2856471314527551ab3f76a714fc7 SHA1 a08cc1aee8b901a998b17b4f85177f0365ef9f65 SHA256 4ee44f36eebab15ffd071a61ddbccdc72833dd6bd021e238512cc6278b50a2ca
+EBUILD nodejs-0.7.7-r1.ebuild 2054 RMD160 992f1fc2163e94589f8ec56cec9c4e44a311ef1d SHA1 ac01d09df3c020f110ddda49fd02e8cca45a06c6 SHA256 8e411c5b4a9cd76e9aec88db5654a88b71968f95cbca06b66c017d7abd293488
+MISC ChangeLog 6051 RMD160 bb487e2bc24583515dd04a4930f362ae8ac6bd22 SHA1 985c81a4c18583c15515e12f8d63bdf3b55727c0 SHA256 a892d3f798ccb945658b89e716818c41128b02f69b4e2b408bca8598cabd3464
 MISC metadata.xml 328 RMD160 e5da1c480cbfe9b6db2e3bdc4bf8b3c291018d83 SHA1 7aed54b3272a8262b0b3ed60355a8f8c4e16141e SHA256 ad2c212a575c70f52ed8075ccc5ceca143c69b933e94a0e14db5b81c2af09a0d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (Darwin)
+
+iEYEARECAAYFAk+UHXEACgkQX3X2B8XHTokpXACdHhDahFIcZzBPP8+AL/8t1pw8
+mBkAn1Nu5Lepgv/jIGnHURA841tHxUxe
+=y1yT
+-----END PGP SIGNATURE-----
diff --git a/net-libs/nodejs/nodejs-0.7.7-r1.ebuild b/net-libs/nodejs/nodejs-0.7.7-r1.ebuild
index 2a1f9296a09f..0102daa02ab4 100644
--- a/net-libs/nodejs/nodejs-0.7.7-r1.ebuild
+++ b/net-libs/nodejs/nodejs-0.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.7-r1.ebuild,v 1.1 2012/04/15 00:49:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.7.7-r1.ebuild,v 1.2 2012/04/22 15:01:32 grobian Exp $
 
 EAPI=3
 
@@ -31,9 +31,11 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-#src_prepare() {
-#	sed -i -e "/flags = \['-arch', arch\]/s/= .*$/= ''/" wscript || die
-#}
+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
+}
 
 src_configure() {
 	# this is an autotools lookalike confuserator
@@ -50,13 +52,13 @@ src_install() {
 	# WHY U NO MAEK SENSE?!
 	#emake DESTDIR="${D}" install || die
 
-	mkdir -p "${D}"/usr/include/node
-	mkdir -p "${D}"/usr/bin
-	mkdir -p "${D}"/lib/node_modules/npm
-	cp 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${D}"/usr/include/node || die "Failed to copy stuff"
-	cp 'deps/uv/include/ares.h' 'deps/uv/include/ares_version.h' "${D}"/usr/include/node || die "Failed to copy stuff"
-	cp 'out/Release/node' ${D}/usr/bin/node || die "Failed to copy stuff"
-	cp -R deps/npm/* ${D}/lib/node_modules/npm || die "Failed to copy stuff"
+	mkdir -p "${ED}"/usr/include/node
+	mkdir -p "${ED}"/usr/bin
+	mkdir -p "${ED}"/lib/node_modules/npm
+	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"
+	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"
 
 	# now add some extra stupid just because we can
 	# needs to be a symlink because of hardcoded paths ... no es bueno!