Version bump for dev channel release. Fix bug #343805 by Julien Sanchez <julien.sanchez@gmail.com>. Remove old.

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

5 files changed, 126 insertions, 29 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 39d6c299af1b..f14e90306505 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.223 2010/11/09 17:28:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.224 2010/11/10 15:33:23 phajdan.jr Exp $
+
+*chromium-9.0.576.0 (10 Nov 2010)
+
+  10 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-vpx-r0.patch, -chromium-9.0.570.0.ebuild,
+  +chromium-9.0.576.0.ebuild, chromium-9999.ebuild:
+  Version bump for dev channel release. Fix bug #343805 by Julien Sanchez
+  <julien.sanchez@gmail.com>. Remove old.
 
   09 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
   Remove patch applied upstream, bug #344787 by Julien Sanchez
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fd03e72cf3b1..3778aa727100 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,15 +10,17 @@ AUX chromium-system-icu-r0.patch 705 RMD160 88ace1e61e1da871fec979e23b0242e8e5ba
 AUX chromium-system-icu-r1.patch 735 RMD160 d3fabb98c3de79afd87f4dad2fd842eac31b0167 SHA1 6f2d38dcd26dbd948237a3a6185e2dfff753fb5a SHA256 f37bcb4938d7600a1c56fd6494fa8680ff19749a3a50df82b5c88b8c996e2185
 AUX chromium-system-sqlite-r0.patch 1802 RMD160 7e796e63a2415b98b7192f466481ea00d86d5ddf SHA1 13bb913c620b813f5a5436864a002374b2da9b7b SHA256 c34e65648c1593d3c693db643d342c192056d2bf5c19b45129ac29ea2862ccf0
 AUX chromium-system-ssl-r0.patch 460 RMD160 50a5a212ed859d9987d2c59bc1d2a6c2e56a7bad SHA1 b1336a7a42b784515ea45bcfe4480580f4345b97 SHA256 374897ac710e37e8ff63de78a751d4078aeb438845541ce294291ab58687984b
+AUX chromium-system-vpx-r0.patch 2429 RMD160 718a25b6a86cf67f7a9229f800d6515ffba65880 SHA1 ad2efdd21ae22c884a3cbebca52f09c229980060 SHA256 eb937a617cbcdaeb5955e46855cda28cd18d3fc6c844126cbc5f46c7e72afb56
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
 DIST chromium-7.0.517.44.tar.bz2 132976535 RMD160 ed7664c7cdf1c4b36c43540d22b4668caccfcef7 SHA1 feeaaa0f26965c9572723b1902ef062cb9cc0ac4 SHA256 ca10b1df650f790e7b6952c1cdc2e968ec0e1f02556dbe9bcb7b4cbcf1bef9dc
 DIST chromium-8.0.552.28.tar.bz2 135220945 RMD160 5b4f44f0772737e06f8e51d8b9a510531da3c689 SHA1 49a00af8b0e2c5711ce42f6eb726b1a8172c70da SHA256 424ecce8357e0fd899e37414841ce5266933e51ebea5a6f04b723eb80e6ef78f
 DIST chromium-9.0.570.0.tar.bz2 136854856 RMD160 2aad862a16950ae25a5ed63b9ef0e3c7e1599e28 SHA1 5cb853e84bd9cca483f57cfc05cb0d25cc203771 SHA256 4722cefb8ac7163915d8a9610aedf615e1ac0d3db13fbc24b61cda3f16d03090
+DIST chromium-9.0.576.0.tar.bz2 139121947 RMD160 3d6a4679babeda5015d6ccdeb4b2c2cbe85af19f SHA1 70ea7e9d16ecccf959dcb86d62c749845081150d SHA256 a41d4a950b18112d5a502b2620b61287609801cf3ed5dd28ee98233bddb4e010
 EBUILD chromium-7.0.517.44.ebuild 7185 RMD160 31b2bf4af67c42ee3b9982ba6a893ff81703c37e SHA1 2b9ae7887c02d3044fe8f2677bf69db95a3775a5 SHA256 927eb1bab33abaf99bf9ad3a4400b584cea8bce3e5f4a25c6bd4f328d6773cf6
 EBUILD chromium-8.0.552.28.ebuild 8606 RMD160 975cb06183e5e4b7fc17cad43bd06991e16dd6b2 SHA1 606212cacfa6e634d21a8c269ae57e4a1f192423 SHA256 005b8b7918ace91aa5cf6361c59d116d01feeda052edf300e37a9280f2757b9d
 EBUILD chromium-9.0.570.0-r1.ebuild 8992 RMD160 be1395f37ac82b0db80f4360394e66a4d28bfe63 SHA1 83d9faa67dc4fcc6ccb246541af16b1843411fbc SHA256 d00a1ce69c6ede58583802f637f60935c0ad2293bd441749249e16b869c4f239
-EBUILD chromium-9.0.570.0.ebuild 8700 RMD160 09eb861faf6c0458a208edf07bf4ebf577df0a7e SHA1 caeda0e8ea77ec323f09a5bce73d9eb59e764e90 SHA256 fdc9f8345627a2abc7f10777deb63b40161b20ca4bec55265956bdfc6dbea3c1
-EBUILD chromium-9999.ebuild 10586 RMD160 3de402c0bc084292be7a411d2990c98aa681051e SHA1 a5eca0b858d825d8d898e0711c90782f66e157e9 SHA256 ee8af9820cb058b4ce520497b6d9c465042c997ef98e761618904696e61201e2
-MISC ChangeLog 49198 RMD160 b464683f058944e8a2a2a6b4c45265360c4253cf SHA1 55b0e9e44383e173e8f2a29e76a8343af49b1ddd SHA256 ed06b1993446ace83b4803a0a677ad1db863b3b2b43141b665c57327a79c9a31
+EBUILD chromium-9.0.576.0.ebuild 8991 RMD160 88ff17fe3a53c79586fd6a8c6496a3b6b4312f93 SHA1 7770278f2baed01b70dda40d8cb2dd6adbd0d3c2 SHA256 ccb577e480ec37844fb887062a77a94ab7b899ab0505789cbac4c38620a948ea
+EBUILD chromium-9999.ebuild 10588 RMD160 99eedf7970910104e87a3f1410263b7a56676341 SHA1 36dcb3fdc86d6270155c743152b74a3d0135f6dd SHA256 16c75844b34f4a0e295c05fa61b96b47bdb458b18cf677677e1961f170add454
+MISC ChangeLog 49524 RMD160 d46b48453cff978509f9a072e6c789676b4a4b8e SHA1 dfcd8f55e168af5bba2ee0471a2f532088f2ab5a SHA256 9b9dd43dca615fbc087aaec28f4f9dc0e54523e6ef6197b7084ac076d31ab6a6
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-9.0.570.0.ebuild b/www-client/chromium/chromium-9.0.576.0.ebuild
index 931c123f8c74..1a8b336e1d97 100644
--- a/www-client/chromium/chromium-9.0.570.0.ebuild
+++ b/www-client/chromium/chromium-9.0.576.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-9.0.570.0.ebuild,v 1.7 2010/11/08 16:45:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.576.0.ebuild,v 1.1 2010/11/10 15:33:23 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -20,17 +20,19 @@ RDEPEND="app-arch/bzip2
 	system-sqlite? (
 		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
 	)
-	system-v8? ( ~dev-lang/v8-2.5.2 )
+	system-v8? ( ~dev-lang/v8-2.5.4 )
+	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
+	gnome? ( >=gnome-base/gconf-2.24.0 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	virtual/jpeg
 	media-libs/libpng
+	media-libs/libvpx
 	>=media-video/ffmpeg-0.6_p25423[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
@@ -52,6 +54,12 @@ RDEPEND+="
 	virtual/ttf-fonts
 	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
 
+egyp() {
+	set -- build/gyp_chromium --depth=. "${@}"
+	echo "${@}" >&2
+	"${@}"
+}
+
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
@@ -89,6 +97,12 @@ src_prepare() {
 	# Enable optional support for gecko-mediaplayer.
 	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
 
+	# Make GConf dependency optional, http://crbug.com/13322.
+	epatch "${FILESDIR}"/${PN}-gconf-optional-r0.patch
+
+	# Make sure we don't use bundled libvpx headers.
+	epatch "${FILESDIR}"/${PN}-system-vpx-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/icu"
@@ -97,6 +111,7 @@ src_prepare() {
 	remove_bundled_lib "third_party/libevent"
 	remove_bundled_lib "third_party/libjpeg"
 	remove_bundled_lib "third_party/libpng"
+	remove_bundled_lib "third_party/libvpx"
 	remove_bundled_lib "third_party/libxml"
 	remove_bundled_lib "third_party/libxslt"
 	remove_bundled_lib "third_party/lzma_sdk"
@@ -105,6 +120,7 @@ src_prepare() {
 	remove_bundled_lib "third_party/pyftpdlib"
 	remove_bundled_lib "third_party/simplejson"
 	remove_bundled_lib "third_party/tlslite"
+	remove_bundled_lib "third_party/yasm"
 	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
 	# remove it (minizip-related).
@@ -152,6 +168,7 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libxml=1
+		-Duse_system_vpx=1
 		-Duse_system_zlib=1"
 
 	if use system-sqlite; then
@@ -165,6 +182,13 @@ src_configure() {
 		myconf+=" -Duse_cups=0"
 	fi
 
+	# Make GConf dependency optional, http://crbug.com/13322.
+	if use gnome; then
+		myconf+=" -Duse_gconf=1"
+	else
+		myconf+=" -Duse_gconf=0"
+	fi
+
 	if use "gnome-keyring"; then
 		myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
 	else
@@ -214,21 +238,12 @@ src_configure() {
 		die "Failed to determine target arch, got '$myarch'."
 	fi
 
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	fi
-
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
-	build/gyp_chromium --depth=. ${myconf} || die
+	egyp ${myconf} || die
 }
 
 src_compile() {
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index d84cd1ef44dc..53ce8beb68fd 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.108 2010/11/09 17:28:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.109 2010/11/10 15:33:23 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2
 	system-sqlite? (
 		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
 	)
-	system-v8? ( ~dev-lang/v8-2.5.2 )
+	system-v8? ( ~dev-lang/v8-2.5.4 )
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
@@ -34,6 +34,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	virtual/jpeg
 	media-libs/libpng
+	media-libs/libvpx
 	>=media-video/ffmpeg-0.6_p25423[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
@@ -98,6 +99,12 @@ src_unpack() {
 	elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH}_p${CREV} "
 }
 
+egyp() {
+	set -- build/gyp_chromium --depth=. "${@}"
+	echo "${@}" >&2
+	"${@}"
+}
+
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
@@ -135,6 +142,9 @@ src_prepare() {
 	# Enable optional support for gecko-mediaplayer.
 	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
 
+	# Make sure we don't use bundled libvpx headers.
+	epatch "${FILESDIR}"/${PN}-system-vpx-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/icu"
@@ -143,6 +153,7 @@ src_prepare() {
 	remove_bundled_lib "third_party/libevent"
 	remove_bundled_lib "third_party/libjpeg"
 	remove_bundled_lib "third_party/libpng"
+	remove_bundled_lib "third_party/libvpx"
 	remove_bundled_lib "third_party/libxml"
 	remove_bundled_lib "third_party/libxslt"
 	remove_bundled_lib "third_party/lzma_sdk"
@@ -151,6 +162,7 @@ src_prepare() {
 	remove_bundled_lib "third_party/pyftpdlib"
 	remove_bundled_lib "third_party/simplejson"
 	remove_bundled_lib "third_party/tlslite"
+	remove_bundled_lib "third_party/yasm"
 	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
 	# remove it (minizip-related).
@@ -198,6 +210,7 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libxml=1
+		-Duse_system_vpx=1
 		-Duse_system_zlib=1"
 
 	if use system-sqlite; then
@@ -267,21 +280,12 @@ src_configure() {
 		die "Failed to determine target arch, got '$myarch'."
 	fi
 
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	fi
-
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
-	build/gyp_chromium --depth=. ${myconf} || die
+	egyp ${myconf} || die
 }
 
 src_compile() {
diff --git a/www-client/chromium/files/chromium-system-vpx-r0.patch b/www-client/chromium/files/chromium-system-vpx-r0.patch
new file mode 100644
index 000000000000..102a083ac589
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-vpx-r0.patch
@@ -0,0 +1,68 @@
+--- remoting/base/encoder_vp8.cc.orig	2010-11-10 09:52:56.000000000 +0100
++++ remoting/base/encoder_vp8.cc	2010-11-10 09:53:32.000000000 +0100
+@@ -11,9 +11,9 @@
+ 
+ extern "C" {
+ #define VPX_CODEC_DISABLE_COMPAT 1
+-#include "third_party/libvpx/include/vpx/vpx_codec.h"
+-#include "third_party/libvpx/include/vpx/vpx_encoder.h"
+-#include "third_party/libvpx/include/vpx/vp8cx.h"
++#include "vpx/vpx_codec.h"
++#include "vpx/vpx_encoder.h"
++#include "vpx/vp8cx.h"
+ }
+ 
+ namespace remoting {
+--- remoting/base/decoder_vp8.cc.orig	2010-11-10 09:54:14.000000000 +0100
++++ remoting/base/decoder_vp8.cc	2010-11-10 09:54:37.000000000 +0100
+@@ -10,9 +10,9 @@
+ 
+ extern "C" {
+ #define VPX_CODEC_DISABLE_COMPAT 1
+-#include "third_party/libvpx/include/vpx/vpx_codec.h"
+-#include "third_party/libvpx/include/vpx/vpx_decoder.h"
+-#include "third_party/libvpx/include/vpx/vp8dx.h"
++#include "vpx/vpx_codec.h"
++#include "vpx/vpx_decoder.h"
++#include "vpx/vp8dx.h"
+ }
+ 
+ namespace remoting {
+--- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig	2010-11-10 09:55:43.000000000 +0100
++++ third_party/ffmpeg/ffmpeg_stub_headers.fragment	2010-11-10 09:56:09.000000000 +0100
+@@ -7,9 +7,9 @@
+ #include <libavformat/avformat.h>
+ 
+ #define VPX_CODEC_DISABLE_COMPAT 1
+-#include "third_party/libvpx/include/vpx/vpx_codec.h"
+-#include "third_party/libvpx/include/vpx/vpx_encoder.h"
+-#include "third_party/libvpx/include/vpx/vpx_decoder.h"
++#include "vpx/vpx_codec.h"
++#include "vpx/vpx_encoder.h"
++#include "vpx/vpx_decoder.h"
+ 
+ typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
+ 
+--- third_party/ffmpeg/ffmpeg.gyp.orig	2010-11-10 11:53:27.000000000 +0100
++++ third_party/ffmpeg/ffmpeg.gyp	2010-11-10 11:55:07.000000000 +0100
+@@ -902,10 +902,20 @@
+               'cflags': [
+                 '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+               ],
++              'link_settings': {
++                'libraries': [
++                  '-lvpx',
++                ],
++              },
+               'direct_dependent_settings': {
+                 'cflags': [
+                   '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+                 ],
++                'link_settings': {
++                  'libraries': [
++                    '-lvpx',
++                  ],
++                },
+               },
+             }, {  # else use_system_ffmpeg==0, add local copy to include path
+               'include_dirs': [