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

(Portage version: 2.2.01.20389-prefix/cvs/Darwin i386, RepoMan options: --force)

2 files changed, 17 insertions, 12 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/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!