Fix compilation in new native client part

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 11 insertions, 204 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index dffe97548b82..856e574afc8e 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,67 +1,8 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.11 2009/10/01 11:51:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.12 2009/10/02 14:29:23 voyageur Exp $
 
-*chromium-9999 (01 Oct 2009)
-
-  01 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  +chromium-9999.ebuild:
-  Add live ebuild for those who wonder what to do of their free diskspace
-
-  30 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  chromium-4.0.212.0_p26805.ebuild, chromium-4.0.219.4_p27359.ebuild:
-  Fix desktop entry so xdg-open works correctly with chromium as default
-  browser
-
-*chromium-4.0.219.4_p27359 (28 Sep 2009)
-
-  28 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  +chromium-4.0.219.4_p27359.ebuild:
-  Version bump, this finally fixes the useless automatic recreation of
-  ~/Downloads
-
-  23 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  chromium-4.0.212.0_p26805.ebuild:
-  Use bundled libevent until 1.4.13, per upstream advice
-
-  23 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  chromium-4.0.212.0_p26805.ebuild:
-  Correctly set revision for about box, install man page
-
-*chromium-4.0.212.0_p26805 (22 Sep 2009)
-
-  22 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  -chromium-4.0.212.0_p26343.ebuild, +chromium-4.0.212.0_p26805.ebuild,
-  +files/chromium-use_system_libevent.patch:
-  Bump to fix truncated downloads, http://crbug.com/406 . Also use system
-  libevent
-
-  22 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  chromium-4.0.212.0_p26343.ebuild:
-  Fix .desktop entry as reported by nightmorph in bug #285922
-
-  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  files/chromium-launcher.sh:
-  Set CHROME_DESKTOP in the wrapper script
-
-*chromium-4.0.212.0_p26343 (16 Sep 2009)
-
-  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  -chromium-4.0.210.0_p26329.ebuild, +chromium-4.0.212.0_p26343.ebuild:
-  Version number was incorrect (they really change it often!), grab a V8
-  crash fix on amd64 too
-
-  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  +files/chromium-drop_sse2.patch, chromium-4.0.210.0_p26329.ebuild:
-  Forgot patch for x86 users, to prevent automatic enabling of
-  -march=pentium4 -msse2
-
-*chromium-4.0.210.0_p26329 (16 Sep 2009)
-
-  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  +chromium-4.0.210.0_p26329.ebuild, +files/chromium-launcher.sh,
-  +metadata.xml:
-  Initial commit, ebuild py Pawel Hajdan Jr <phajdan.jr@chromium.org> and
-  me, bug #278975. Tarball hosted on gentoo mirrors until upstream makes
-  official ones available
+  02 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-4.0.212.0_p26805.ebuild, chromium-9999.ebuild:
+  Fix compilation in new native client part
 
diff --git a/www-client/chromium/chromium-4.0.212.0_p26805.ebuild b/www-client/chromium/chromium-4.0.212.0_p26805.ebuild
deleted file mode 100644
index 34eb5d450942..000000000000
--- a/www-client/chromium/chromium-4.0.212.0_p26805.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.212.0_p26805.ebuild,v 1.4 2009/09/30 12:36:10 voyageur Exp $
-
-EAPI="2"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.2
-	>=gnome-base/gconf-2.24.0
-	media-fonts/corefonts
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-video/ffmpeg-0.5_p19787
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7"
-#	>=dev-libs/libevent-1.4.13
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23"
-
-export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-src_prepare() {
-	# Needed until we add back "rootdir=.", see below
-	for i in app webkit third_party/ffmpeg build/util base chrome v8/tools/gyp
-	do
-		ln -s "${S}"/out ${i}/out
-	done
-
-	# Changing this in ~/include.gypi does not work
-	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
-	# Add configuration flag to use system libevent
-	epatch "${FILESDIR}"/${PN}-use_system_libevent.patch
-
-	# Display correct svn revision in about box
-	echo "${PV/[0-9.]*\_p}" > build/LASTCHANGE.in || die "setting revision failed"
-}
-
-src_configure() {
-	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp
-	cat << EOF > "${S}"/.gyp/include.gypi
-{
-	'target_defaults': {
-		'cflags': [ '${CFLAGS// /','}' ],
-		'ldflags': [ '${LDFLAGS// /','}' ],
-	},
-}
-EOF
-	export HOME="${S}"
-
-	# Configuration options (system libraries)
-	local myconf="-Duse_system_bzip2=1 -Duse_system_zlib=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1 -Dlinux_use_tcmalloc=1"
-	# -Duse_system_libevent=1: http://crbug.com/22140
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if use amd64; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	fi
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	# Broken for "Argument list too long":
-	# http://code.google.com/p/chromium/issues/detail?id=19854
-	# http://code.google.com/p/gyp/issues/detail?id=71
-	# When this is fixed, remove the src_prepare
-	# and add back "rootdir=${S}"
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
-		|| die "compilation failed"
-}
-
-src_install() {
-	# Chromium does not have "install" target in the build system.
-
-	dodir ${CHROMIUM_HOME}
-
-	exeinto ${CHROMIUM_HOME}
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-	doins -r out/Release/themes
-
-	newman out/Release/chromium-browser.1 chrome.1
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-}
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index be686bec8c24..d4efa0544f41 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.1 2009/10/01 11:51:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.2 2009/10/02 14:29:23 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion
@@ -80,8 +80,11 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Needed until we add back "rootdir=.", see below
-	for i in app webkit third_party/ffmpeg build/util base chrome v8/tools/gyp
+	# Needed until we add back "rootdir=${S}", see below
+	for i in app webkit third_party/ffmpeg build/util \
+		base chrome v8/tools/gyp \
+		native_client/src/trusted/validator_*/ \
+		native_client/src/trusted/service_runtime/arch/*/
 	do
 		ln -s "${S}"/out ${i}/out
 	done
@@ -130,7 +133,7 @@ src_compile() {
 	# Broken for "Argument list too long":
 	# http://code.google.com/p/chromium/issues/detail?id=19854
 	# http://code.google.com/p/gyp/issues/detail?id=71
-	# When this is fixed, remove the src_prepare
+	# When this is fixed, remove the src_prepare symlinks
 	# and add back "rootdir=${S}"
 	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
 		CC=$(tc-getCC) \