Version bump for dev channel release. Fix bug #405515 by Julien Sanchez. Remove old.

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

4 files changed, 24 insertions, 16 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 31f942fa27af..db110c3f89ef 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.565 2012/02/22 03:17:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.566 2012/02/24 17:30:17 phajdan.jr Exp $
+
+*chromium-19.0.1049.3 (24 Feb 2012)
+
+  24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-19.0.1036.7.ebuild, +chromium-19.0.1049.3.ebuild,
+  chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Fix bug #405515 by Julien Sanchez.
+  Remove old.
 
 *chromium-18.0.1025.39 (22 Feb 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 78dcbc0fba57..19cc71d9dffa 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 726 RMD160 f3193ce9f987b6e5ad05a67d090ab4f9e1cb7b41 SHA1 8efd3479977e89429237d49fefbfcc63d250089e SHA256 800a669839ca7e033bb360b0cd9db92dde93505609c0b9184bf3901d2ec1535b
@@ -21,21 +21,21 @@ AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1
 DIST chromium-17.0.963.56.tar.bz2 165312378 RMD160 8d29f7369f787c847be9f1f0cfb5fbe4484b7d2f SHA1 87863f6d02d9105724493025e3a60733cc3f8d20 SHA256 270be138d499c6c2092644af69acab8310cb05c3d06c3afe7891e488c29b020f
 DIST chromium-18.0.1025.33.tar.bz2 174215867 RMD160 d4caca9574369bb24020f462786720e8721a07ad SHA1 6ef20848252959f38c7c29527d83cf53469c9ce4 SHA256 9ff156435eab5681db899c3c8bd335128ec4b3d3f7e10b4efc6eeb0e46e28fad
 DIST chromium-18.0.1025.39.tar.bz2 174226740 RMD160 a4dba64edba300eeee6fe6092ad46c48a290e358 SHA1 aa9411e48dcc8182d8f563bb12e3b747550700a6 SHA256 64a3e0e8325b5269a48e2b49c7e236b33041ed6328a7f56e3e6f6fbf7eb345df
-DIST chromium-19.0.1036.7.tar.bz2 175152198 RMD160 d3b3a6e6ff2d0bc41542716123b36189d6b2bd3b SHA1 1e8a2e16eabf58857bec5e7fac156b357f2a5eac SHA256 0fa284c58b1324ff148d896bac6f8d817507720f4756275c08602182bc52cf8b
 DIST chromium-19.0.1041.0.tar.bz2 175416503 RMD160 1a956361191525124c19822eb8724277521c900f SHA1 331a4cfec4db131749c7d049d5a54d5d632b6e92 SHA256 ea08856709fd1e62266b03db97727d9be922ac4b58451051f1f408a0903d4f19
+DIST chromium-19.0.1049.3.tar.bz2 176721817 RMD160 14a6996885e29d13bb7912dc750db762ac48f0c0 SHA1 10dcd963c7e61d63f1a0d4eb6058216a402d7eb2 SHA256 3bdce0bd8381cd699014e7ec72ab02c7d8444ba511c27afff76bf015361c4021
 EBUILD chromium-17.0.963.56.ebuild 17906 RMD160 90d4f1008405ff14822ea59a89938e8b4556a4ce SHA1 9dbd830257a7c230cfab297e38ddaeb297c95398 SHA256 7e281f08e72800eec241da971c05fc9615510765d617f7c61b8436afbea56762
 EBUILD chromium-18.0.1025.33.ebuild 17850 RMD160 e2589e071d50de207dd4c461425f63ec30527030 SHA1 6ad42bd71b67af8cf6c27cb11bd3938f5c7b7098 SHA256 75c700fffdaac071e8c317a4ae2b00acf8f75790a0d7405e3bdded17d0b605cb
 EBUILD chromium-18.0.1025.39.ebuild 17850 RMD160 4b3072b2ec7f7aebdc62fb26b72c38f3ad534936 SHA1 810a8a10485a5db173ef4be2de4e01505da3a24c SHA256 b1428094aaa745af9971b6868965ab63914019e778ced22d6b08f5094f686daf
-EBUILD chromium-19.0.1036.7.ebuild 17620 RMD160 7f55ab4e54f63099e83e5691eb5f12f2a9f0f1e5 SHA1 17e275506c7bdc05b6f267b085af7fc7a2baee5b SHA256 376a113dbb955c0191e3c3eb8726b79355af64d3121026629f74c2f614521dcf
 EBUILD chromium-19.0.1041.0.ebuild 17638 RMD160 77644c8d68c5e7adceaca34eaf57577d018f83bd SHA1 b0745f5632692bb9c8007f12820a517d880dad05 SHA256 c8c79fe9ea1b7fcc8a90882b4995366788fcea2dd14c35eace35e197ba87983a
-EBUILD chromium-9999-r1.ebuild 19804 RMD160 ad96986c10b4d099d69de5730103461fe0422cd4 SHA1 5c563f5dc486c97ede7bbac28d0718ea65f19911 SHA256 05d69d587ad65209f62d969a3967661a59829cefbcdedd465e21125fe79c9900
-MISC ChangeLog 7651 RMD160 fd12aeeff68d9d5d5fbe25aa939df7899c3572ad SHA1 c34d0fbd8a20c3bb73bc5cba0fae5bf524b6461e SHA256 ee27903143638b2afa033f572059b39d3c7b937b435fc8ac0b6e64847e3d755e
+EBUILD chromium-19.0.1049.3.ebuild 17673 RMD160 36bf6f1c493c7e313e7b44f3180f2681377f6d16 SHA1 ba056cdf8a0c0e447cd8923bca2c3f883e3fa1d4 SHA256 9643d31654ab9f53176fb3ea175a1746cfea11421d804edd43528a2c0a3f87db
+EBUILD chromium-9999-r1.ebuild 19839 RMD160 c2d5a3e2b48ce40de20d0a43258c387f87604215 SHA1 9d02aff405dd9502f5ca85ea2188bf37cf7d59f1 SHA256 0e06bdb8b84a3629e08a17903466bc4ba900f714faef34bd6c29468ab8c7ba3f
+MISC ChangeLog 7925 RMD160 212f1c0b3071b36a6139d332924fa0b4971e2bab SHA1 93cc9000d6f230b9cef8ba5dcc52529ee53b43ad SHA256 4097527cbc7a20b124431afb758ae3843380dd9e315d883d85b405efd5e169f2
 MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9EXlgACgkQC77qH+pIQ6RdCQD9Hpy6Z/p4H4FZXB6S6U58P6Wg
-X3vKV4xcEbX7cQsMdnAA/1nI0ykpdwIsZAxbtdY/YHYWhI/Kr8g9hd9ZhU20fsVZ
-=plK6
+iEYEAREKAAYFAk9HyTQACgkQuUQtlDBCeQJD1gCfWYgm7O7OXeFUyhRAt9kN2Bo5
+MsIAn08K4aWTL4L+LkalDGwF4bQd7DTB
+=43ns
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-19.0.1036.7.ebuild b/www-client/chromium/chromium-19.0.1049.3.ebuild
index ffa10c3820a4..ae337509d950 100644
--- a/www-client/chromium/chromium-19.0.1036.7.ebuild
+++ b/www-client/chromium/chromium-19.0.1049.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1036.7.ebuild,v 1.2 2012/02/13 16:14:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1049.3.ebuild,v 1.1 2012/02/24 17:30:17 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -42,7 +42,7 @@ RDEPEND="app-arch/bzip2
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
-	virtual/jpeg
+	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.1.3
 	media-libs/speex
@@ -186,14 +186,12 @@ src_prepare() {
 		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
 		chrome/common/zip*.cc || die
 
-	# Revert WebKit changeset responsible for Gentoo bug #393471.
-	epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r2.patch"
-
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/adobe/*' \
 		\! -path 'third_party/angle/*' \
 		\! -path 'third_party/cacheinvalidation/*' \
 		\! -path 'third_party/cld/*' \
@@ -387,8 +385,9 @@ src_test() {
 
 	# NetUtilTest: bug #361885.
 	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
+	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
 	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig'
+		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
 
 	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
 }
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 4c4df32d96fe..4cc53544ce8f 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.94 2012/02/17 15:24:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.95 2012/02/24 17:30:17 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -247,6 +247,7 @@ src_prepare() {
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/adobe/*' \
 		\! -path 'third_party/angle/*' \
 		\! -path 'third_party/cacheinvalidation/*' \
 		\! -path 'third_party/cld/*' \