Fix bug #386683 by Julien Sanchez, patch by Julien Sanchez. Upstream API change in 3.5: http://code.google.com/p/v8/source/detail?spec=svn9837&r=9008

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 36 insertions, 5 deletions

diff --git a/net-libs/nodejs/ChangeLog b/net-libs/nodejs/ChangeLog
index fe47fedd91bb..38de40af1461 100644
--- a/net-libs/nodejs/ChangeLog
+++ b/net-libs/nodejs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/nodejs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.15 2011/10/22 17:09:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.16 2011/10/30 09:20:59 phajdan.jr Exp $
+
+  30 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> nodejs-0.4.12.ebuild,
+  +files/nodejs-v8-3.5.patch:
+  Fix bug #386683 by Julien Sanchez, patch by Julien Sanchez. Upstream API
+  change in 3.5: http://code.google.com/p/v8/source/detail?spec=svn9837&r=9008
 
 *nodejs-0.4.12 (22 Oct 2011)
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 746acd4cd852..b0ec5de61209 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX nodejs-v8-3.5.patch 440 RMD160 3acac03a96fa3c6365a076eb47b4c1bac12d5a2c SHA1 135a23be4458187b358d5edb3c5f46be92312c45 SHA256 e27140ed4fb2d9db928c8a8138b53461eea352261265f9953c821ca15dfdd91f
 DIST node-v0.4.11.tar.gz 12419274 RMD160 0512138fbf05d472a42bfa5453c5dd851c06c716 SHA1 ea0898745094cf771b2860d90629ec867734be52 SHA256 e009522d52c4a844c46e51c63b852899d1b7e6d949d1a139cdc16b4f6c4ab63f
 DIST node-v0.4.12.tar.gz 12421469 RMD160 3861afdcbe49516c018fa0d5a5416b15a10b8f05 SHA1 1c6e34b90ad6b989658ee85e0d0cb16797b16460 SHA256 c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4
 EBUILD nodejs-0.4.11.ebuild 774 RMD160 d1b815dd72c0f48847b2bc73ead6c430390e54d7 SHA1 d007193c60c5da2a183ca19726f99590f7b0b5db SHA256 3d9bfd4ac65dcac2573da9ea217207cef6e0e6d5fe8e74bca4717bd78a2ab542
-EBUILD nodejs-0.4.12.ebuild 774 RMD160 5cca0a7ef7e0916fa1c909748901b5f01a0d249e SHA1 736544cfc00a0fd512b9f8129ae257ee5a3d8bda SHA256 fd384b2d2e18fcf7b174069cf0140c13b0c424d165246533e5215ef663ff7b5a
-MISC ChangeLog 2766 RMD160 5955c1370ea1e1583e413ae7048b318cf0150336 SHA1 111f6e7de0ca1511c3801fbfd7d2b165ce8edada SHA256 53574142c5c1e35e25ba86c38c45a9ada5c695133d9756f4be586a8560ae2fed
+EBUILD nodejs-0.4.12.ebuild 850 RMD160 300de6491a1850b606464ee7a1956021d33331c6 SHA1 c63ff56ec1c50b8d1f49d5436b8eacd1a14afa9a SHA256 bbbb89191350b0ae58697584596d50d251e5eed68fb60e7d8521654f59a45cbb
+MISC ChangeLog 3031 RMD160 6710d17c9e55630dd7bef98404f28c46de582dcf SHA1 0bc7ef4df29d88f1ee3ad1872db5390864a46c84 SHA256 46a9b311ba32e01dcea36c56e020668d3d02f09a41b36abc8d7edf6878337145
 MISC metadata.xml 328 RMD160 e5da1c480cbfe9b6db2e3bdc4bf8b3c291018d83 SHA1 7aed54b3272a8262b0b3ed60355a8f8c4e16141e SHA256 ad2c212a575c70f52ed8075ccc5ceca143c69b933e94a0e14db5b81c2af09a0d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk6tFw8ACgkQuUQtlDBCeQJ2RgCfcZ+WoqSqyAwjaiDlA0D67AaG
+lmQAn3mJevCtEIAaUDPq1D0D94M/e+az
+=Fa5d
+-----END PGP SIGNATURE-----
diff --git a/net-libs/nodejs/files/nodejs-v8-3.5.patch b/net-libs/nodejs/files/nodejs-v8-3.5.patch
new file mode 100644
index 000000000000..87a8eeda0a57
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-v8-3.5.patch
@@ -0,0 +1,11 @@
+--- src/node_buffer.cc	2011-10-25 08:45:00.665600749 +0200
++++ src/node_buffer.cc	2011-10-25 08:45:31.168622565 +0200
+@@ -478,7 +478,7 @@
+ 
+   if (written > 0 && p[written-1] == '\0' && char_written == length) {
+     uint16_t last_char;
+-    s->Write(&last_char, length - 1, 1, String::NO_HINTS);
++    s->Write(&last_char, length - 1, 1, String::NO_OPTIONS);
+     if (last_char != 0 || written > s->Utf8Length()) {
+       written--;
+     }
diff --git a/net-libs/nodejs/nodejs-0.4.12.ebuild b/net-libs/nodejs/nodejs-0.4.12.ebuild
index 215b1acd4712..4056517bf606 100644
--- a/net-libs/nodejs/nodejs-0.4.12.ebuild
+++ b/net-libs/nodejs/nodejs-0.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.4.12.ebuild,v 1.1 2011/10/22 17:09:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.4.12.ebuild,v 1.2 2011/10/30 09:20:59 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -18,12 +18,16 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/v8-2.5.9.6-r1
+DEPEND=">=dev-lang/v8-3.5.10.22
 	dev-libs/openssl"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/node-v${PV}
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-v8-3.5.patch" # bug #386683
+}
+
 src_configure() {
 	# this is a waf confuserator
 	./configure --shared-v8 --prefix=/usr || die