[gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-4.0.266.0-r1.ebuild chromium-9999.ebuild chromium-4.0.295.0.ebuild chromium-4.0.302.2.ebuild chromium-4.0.249.43.ebuild

[Bernard Cafarelli (voyageur)]

voyageur    10/01/26 10:11:40

  Modified:             ChangeLog chromium-4.0.266.0-r1.ebuild
                        chromium-9999.ebuild chromium-4.0.295.0.ebuild
                        chromium-4.0.302.2.ebuild
  Removed:              chromium-4.0.249.43.ebuild
  Log:
  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)

Revision  Changes    Path
1.44                 www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	26 Jan 2010 08:02:46 -0000	1.43
+++ ChangeLog	26 Jan 2010 10:11:39 -0000	1.44
@@ -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@g.o>
+  -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@g.o>
   chromium-4.0.249.43.ebuild, chromium-4.0.266.0.ebuild,



1.3                  www-client/chromium/chromium-4.0.266.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild?r1=1.2&r2=1.3

Index: chromium-4.0.266.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chromium-4.0.266.0-r1.ebuild	26 Jan 2010 08:02:46 -0000	1.2
+++ chromium-4.0.266.0-r1.ebuild	26 Jan 2010 10:11:39 -0000	1.3
@@ -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 @@
 	# 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
 



1.20                 www-client/chromium/chromium-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.19&r2=1.20

Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- chromium-9999.ebuild	26 Jan 2010 08:02:46 -0000	1.19
+++ chromium-9999.ebuild	26 Jan 2010 10:11:39 -0000	1.20
@@ -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_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 @@
 	# 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
 



1.5                  www-client/chromium/chromium-4.0.295.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.295.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.295.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.295.0.ebuild?r1=1.4&r2=1.5

Index: chromium-4.0.295.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.295.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chromium-4.0.295.0.ebuild	26 Jan 2010 08:02:46 -0000	1.4
+++ chromium-4.0.295.0.ebuild	26 Jan 2010 10:11:39 -0000	1.5
@@ -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 @@
 	# 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
 



1.4                  www-client/chromium/chromium-4.0.302.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild?r1=1.3&r2=1.4

Index: chromium-4.0.302.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chromium-4.0.302.2.ebuild	26 Jan 2010 08:02:46 -0000	1.3
+++ chromium-4.0.302.2.ebuild	26 Jan 2010 10:11:39 -0000	1.4
@@ -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 @@
 	# 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