Revert multilib change from bug #296917 as it breaks cross-compiling, bug #301652. Also apply H264 patch to -9999 and remove old

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

6 files changed, 24 insertions, 155 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 4ca2f3b6d668..fe2868ebb720 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.43 2010/01/26 08:02:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.44 2010/01/26 10:11:39 voyageur Exp $
+
+  26 Jan 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-4.0.249.43.ebuild, chromium-4.0.266.0-r1.ebuild,
+  chromium-4.0.295.0.ebuild, chromium-4.0.302.2.ebuild,
+  chromium-9999.ebuild:
+  Revert multilib change from bug #296917 as it breaks cross-compiling, bug
+  #301652. Also apply H264 patch to -9999 and remove old
 
   26 Jan 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-4.0.249.43.ebuild, chromium-4.0.266.0.ebuild,
diff --git a/www-client/chromium/chromium-4.0.249.43.ebuild b/www-client/chromium/chromium-4.0.249.43.ebuild
deleted file mode 100644
index 1dd41c532e3e..000000000000
--- a/www-client/chromium/chromium-4.0.249.43.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.249.43.ebuild,v 1.4 2010/01/26 08:02:46 phajdan.jr 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="+ffmpeg"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg
-	media-libs/libpng
-	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23"
-
-src_prepare() {
-	# Gentoo uses .kde4, not .kde
-	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
-		|| die "kde proxy sed failed"
-	# 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
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/{,WebKit/WebCore/platform/image-decoders}/zlib/zconf.h \
-		|| die "zlib sed failed"
-}
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# 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_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
-	# -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 [[ "$ABI" == "amd64" ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	fi
-
-	if [[ "$ABI" == "x86" ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	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() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		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.
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	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
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	if use ffmpeg; then
-		# 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}
-	fi
-
-	# 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-4.0.266.0-r1.ebuild b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
index 4c74cc500fbe..03a93ff91a1c 100644
--- a/www-client/chromium/chromium-4.0.266.0-r1.ebuild
+++ b/www-client/chromium/chromium-4.0.266.0-r1.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/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v 1.2 2010/01/26 08:02:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v 1.3 2010/01/26 10:11:39 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -82,11 +82,11 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if [[ "$ABI" == "amd64" ]] ; then
+	if use amd64 ; then
 		myconf="${myconf} -Dtarget_arch=x64"
 	fi
 
-	if [[ "$ABI" == "x86" ]] ; then
+	if use x86 ; then
 		myconf="${myconf} -Dtarget_arch=ia32"
 	fi
 
diff --git a/www-client/chromium/chromium-4.0.295.0.ebuild b/www-client/chromium/chromium-4.0.295.0.ebuild
index 12ab1f7373d5..7034c52da8d3 100644
--- a/www-client/chromium/chromium-4.0.295.0.ebuild
+++ b/www-client/chromium/chromium-4.0.295.0.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/www-client/chromium/chromium-4.0.295.0.ebuild,v 1.4 2010/01/26 08:02:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.295.0.ebuild,v 1.5 2010/01/26 10:11:39 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -80,11 +80,11 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if [[ "$ABI" == "amd64" ]] ; then
+	if use amd64 ; then
 		myconf="${myconf} -Dtarget_arch=x64"
 	fi
 
-	if [[ "$ABI" == "x86" ]] ; then
+	if use x86 ; then
 		myconf="${myconf} -Dtarget_arch=ia32"
 	fi
 
diff --git a/www-client/chromium/chromium-4.0.302.2.ebuild b/www-client/chromium/chromium-4.0.302.2.ebuild
index 52c47c024f3c..a15e39649697 100644
--- a/www-client/chromium/chromium-4.0.302.2.ebuild
+++ b/www-client/chromium/chromium-4.0.302.2.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/www-client/chromium/chromium-4.0.302.2.ebuild,v 1.3 2010/01/26 08:02:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild,v 1.4 2010/01/26 10:11:39 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -80,11 +80,11 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if [[ "$ABI" == "amd64" ]] ; then
+	if use amd64 ; then
 		myconf="${myconf} -Dtarget_arch=x64"
 	fi
 
-	if [[ "$ABI" == "x86" ]] ; then
+	if use x86 ; then
 		myconf="${myconf} -Dtarget_arch=ia32"
 	fi
 
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index a32f18928971..c1ca19315a69 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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/www-client/chromium/chromium-9999.ebuild,v 1.19 2010/01/26 08:02:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.20 2010/01/26 10:11:39 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion
@@ -84,12 +84,16 @@ src_unpack() {
 
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
+	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
+	# would be better
 	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
 		|| die "kde proxy sed failed"
 	# 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
+	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
@@ -120,11 +124,11 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if [[ "$ABI" == "amd64" ]] ; then
+	if use amd64 ; then
 		myconf="${myconf} -Dtarget_arch=x64"
 	fi
 
-	if [[ "$ABI" == "x86" ]] ; then
+	if use x86 ; then
 		myconf="${myconf} -Dtarget_arch=ia32"
 	fi