Pass --jobs option to scons if present in the MAKEOPTS, do not hardcode -O3 compiler flag, and add optional support for readline.

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

4 files changed, 40 insertions, 7 deletions

diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog
index ccb05ad2ec32..5bec8e56e56e 100644
--- a/dev-lang/v8/ChangeLog
+++ b/dev-lang/v8/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/v8
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.1 2010/07/25 21:50:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.2 2010/08/02 02:39:22 phajdan.jr Exp $
+
+  02 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/v8-no-O3-r0.patch, v8-2.2.24.ebuild:
+  Pass --jobs option to scons if present in the MAKEOPTS, do not hardcode
+  -O3 compiler flag, and add optional support for readline.
 
 *v8-2.2.24 (25 Jul 2010)
 
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index 12d9ba4bf3fc..815b5044fd50 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -1,5 +1,6 @@
+AUX v8-no-O3-r0.patch 422 RMD160 37467564f5ea6ff519cf86b7209a534424abbba3 SHA1 edbf6d9afc5ea6fdd0e9c0bf06d65caa488914c6 SHA256 c38a393a23adff83a799cb137f8a8e5092f87a62db109d7ce41becd6dec781f5
 AUX v8-no-werror-r0.patch 573 RMD160 17791cdee16894b37e937f23146aff52bc3d4775 SHA1 fa814bfc6c64570e0e69a184f1c36c359b63eb2d SHA256 8968e9b4f362d3e059675c6bb9b6be0d104ac478a62c50a8f7304f47d514e782
 AUX v8-upstream-bug-773-r0.patch 512 RMD160 407e6f3d557c8fbda2deb12698006a39c86bab60 SHA1 37b9f275b4dcd732a5f66b24a5b3dcab6f644142 SHA256 1be72e0ae271969ad67ce9226c89c9def78f3a9be9000be5a752f871b47178cc
-EBUILD v8-2.2.24.ebuild 1372 RMD160 dde1ed434c943f051e0c58112360ec9f0a8c3b06 SHA1 0d878b70fae6340364344cde6aed6eae5ba66237 SHA256 8a77484c9f35da5c672f63d283b6ff4e0144bcbff90d22191f3315a86fe5d64e
-MISC ChangeLog 552 RMD160 3d08ebd09e088ed2d964d116bd79b95fcc766c6c SHA1 12c1b5c2cdb28c2f078d5da84968d1e8dae2923c SHA256 a0b9f9656c5a889c4e696a24ce5d6e4e8ab1b3d8afd34670e5d7dde8d2403cf0
+EBUILD v8-2.2.24.ebuild 1773 RMD160 02e0aa0a60a918135929f6c80870afffc23274ad SHA1 becf396a1a11d6078f8dfb06998c9fcb7dc06e25 SHA256 daa9a3fbc261fee415c775d1844faee9b4702de311883e8837283613964e6a36
+MISC ChangeLog 788 RMD160 506b6c59960865084d28999c8fe52532fbf0187a SHA1 747ff02829db68d4a8f11b517e6114e431ab5e32 SHA256 3feb36d30a6255f90fb102d13a3779a7b069948b0c81e473c5ed00031028d36c
 MISC metadata.xml 162 RMD160 3485b95578a49782c3188a0f963f90c688287fe1 SHA1 46226eeaf4948209a093253f92010abea501daef SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8
diff --git a/dev-lang/v8/files/v8-no-O3-r0.patch b/dev-lang/v8/files/v8-no-O3-r0.patch
new file mode 100644
index 000000000000..aec4924cf1dc
--- /dev/null
+++ b/dev-lang/v8/files/v8-no-O3-r0.patch
@@ -0,0 +1,11 @@
+--- SConstruct.orig	2010-08-02 04:00:18.000000000 +0200
++++ SConstruct	2010-08-02 04:00:28.000000000 +0200
+@@ -148,7 +148,7 @@
+       }
+     },
+     'mode:release': {
+-      'CCFLAGS':      ['-O3', '-fomit-frame-pointer', '-fdata-sections',
++      'CCFLAGS':      ['-fomit-frame-pointer', '-fdata-sections',
+                        '-ffunction-sections'],
+       'os:android': {
+         'CCFLAGS':    ['-mthumb', '-Os'],
diff --git a/dev-lang/v8/v8-2.2.24.ebuild b/dev-lang/v8/v8-2.2.24.ebuild
index 64b4ed20778f..46f2d227b7c5 100644
--- a/dev-lang/v8/v8-2.2.24.ebuild
+++ b/dev-lang/v8/v8-2.2.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-2.2.24.ebuild,v 1.2 2010/07/25 23:39:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-2.2.24.ebuild,v 1.3 2010/08/02 02:39:22 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -14,16 +14,23 @@ LICENSE="BSD"
 
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="readline"
 
-RDEPEND=""
+RDEPEND="readline? ( >=sys-libs/readline-6.1 )"
 DEPEND="${RDEPEND}
 	>=dev-util/scons-1.3.0"
 
+v8_scons_opts() {
+	echo "$(echo ${MAKEOPTS} | sed -r 's/.*(-j\s*|--jobs=)([0-9]+).*/-j\2/')"
+}
+
 src_prepare() {
 	# Stop -Werror from breaking the build.
 	epatch "${FILESDIR}"/${PN}-no-werror-r0.patch
 
+	# Respect the user's CFLAGS, including the optimization level.
+	epatch "${FILESDIR}"/${PN}-no-O3-r0.patch
+
 	# Locally fix http://code.google.com/p/v8/issues/detail?id=773.
 	epatch "${FILESDIR}"/${PN}-upstream-bug-773-r0.patch
 }
@@ -38,7 +45,16 @@ src_compile() {
 	# with the rest of a Linux system. Currently the name
 	# looks like libv8-2.2.24.so, but should be more like
 	# libv8.so.2.2.24.
-	scons library=shared . || die
+
+	local myconf=""
+
+	if use readline; then
+		myconf="${myconf} console=readline"
+	else
+		myconf="${myconf} console=dumb"
+	fi
+
+	scons library=shared $(v8_scons_opts) ${myconf} . || die
 }
 
 src_install() {