Version bump for dev channel release. Remove old.

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

4 files changed, 25 insertions, 33 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ce5b2767f5ad..fb22780053b1 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.627 2012/05/07 18:01:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.628 2012/05/09 13:58:33 phajdan.jr Exp $
+
+*chromium-20.0.1130.1 (09 May 2012)
+
+  09 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-20.0.1123.2.ebuild, +chromium-20.0.1130.1.ebuild,
+  chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Remove old.
 
   07 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-18.0.1025.168.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 143c63acb4a5..d649887a9e39 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-glib-r0.patch 451 RMD160 8b410994406b930c6befc3aed0f4dc958ddf5609 SHA1 594e0508c098cf43c6af86983db966ec537f7f56 SHA256 42469853c5cb1d4376567419f78af848b0f4a1b9f68ce9b5c8ce8c0b3d506193
@@ -15,21 +15,21 @@ AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf207
 DIST chromium-18.0.1025.168.tar.bz2 174835030 RMD160 4637f095081ae805f06ea6937c03445ea6d5b5b1 SHA1 35db27fe50c52ef7cf7d3196a66aa34419929893 SHA256 1f1fc7bd8066835844a465f9d60c49c21173ff559c40e5d113fe9c4627fc18b9
 DIST chromium-19.0.1084.36.tar.bz2 183801020 RMD160 e596d6942dd8c16f3a3abf4fc5c9fe93a2b96e7f SHA1 ed712d24e1c0225dcba4a881502feaa3ee4a3f98 SHA256 6df4d3d2c46973a55a2a1020072f2b772c2cd6491f1cb2054ddc3e7127da7883
 DIST chromium-19.0.1084.41.tar.bz2 183821502 RMD160 0d19a1dc09fef8264ac10a65ff77e882695a44ed SHA1 43a1c1863f9b43372e756cc6f0d23530e02a04dc SHA256 8a4302374978d84af996f82262644c83ac822411e186d73dbc82db54a22aa496
-DIST chromium-20.0.1123.2.tar.bz2 183824571 RMD160 a1f7a1a9533fc121969deb9b9e709498e8cc1ab2 SHA1 232e48e1ef07c16128e141f138da9829313696d2 SHA256 e5293acec0ffe8406314f1cd2b00857a7cac5e75c52bb2777147936a2ea8f758
 DIST chromium-20.0.1123.4.tar.bz2 183840254 RMD160 f43408a7cbd736104cdf7f28ea7c049c06737fa4 SHA1 0ed2737bcfd3df79c4be7d192ada6f764320046b SHA256 5b66ca3fb497d2644e6844f76370391f0c92f884c2d1406f0e53512005563ede
+DIST chromium-20.0.1130.1.tar.bz2 185292564 RMD160 95b7e03ebb22d317aed426ba8bf2d79459c6c3a7 SHA1 07ab4619884cb3b9dcbb1daf3bcba90d507ddefc SHA256 696ba7b76505d2fff12454298a1f5ef0e8f5fdee766b09c6043ddb5e9e9845a4
 EBUILD chromium-18.0.1025.168.ebuild 13972 RMD160 aeeea6ddbfc322a1c72e5639e41109861edda09e SHA1 733347f928f1f5f4eb4c8b1cce34ea8f07fa3999 SHA256 19593b8f85f6e5ec6f6a057e75ce73f248d111f7a23f0c518aff67ec9c877002
 EBUILD chromium-19.0.1084.36.ebuild 13483 RMD160 f4a637fe43efde038dbe3cc7f6d71a5a0c6077a1 SHA1 55480585b21baaae684f7bdc32577c313784be56 SHA256 b962b2306bf6674f526c93abad1c5a609d0e7c31f9148b801e9cb643d5c39bd7
 EBUILD chromium-19.0.1084.41.ebuild 13483 RMD160 7cfb205cff001abedeefaa65cdf83ab8621f8442 SHA1 55877061f40181122b4be546af2bedfc55040256 SHA256 b32555e205cc73e550e3bf9fe5c9d3b0e0799699c8fee6a755dfa8b2453f317a
-EBUILD chromium-20.0.1123.2.ebuild 13740 RMD160 34a499b72c68615f4be232920c85e5d964d1aebb SHA1 5b7cbec54c0941549b9dd867a29a149f0d78159c SHA256 7f47518a48cefa01f4cf57425ef376a618b4ad9eca74189bda766472ca40ad75
 EBUILD chromium-20.0.1123.4.ebuild 13168 RMD160 083ce22efdb5014094f0b0643cf8c0bd892fbc29 SHA1 3256a0b420e1e85f258ed8dbc9f7ba9fb401e50a SHA256 117bd936a907003a81bea69a3c00774a4ddd011d20d3243e6e2ca6aee6751c59
-EBUILD chromium-9999-r1.ebuild 14757 RMD160 7064ee8698c7169503f57d8293d35a596f39ed38 SHA1 2f3d34b875fd07c968fbd7253f0b11348d8b106d SHA256 811b39246b7247cd56db952deea92daf8488e11ea13ab4d47ebcffba83d63687
-MISC ChangeLog 19960 RMD160 9bc4f89c276797921a60fcb286f6936cb2abfbbd SHA1 782a1d003af23206ed448eecdbd271f22441df8a SHA256 16c2e79ef2ab21e1d4dc80a69d12893904f3ee882df46d795d8d690bf3bd207e
+EBUILD chromium-20.0.1130.1.ebuild 13173 RMD160 ceb24833c2daa36c88ae8b37aa5757a9c61ff3bf SHA1 5aa566aa771f4cd91cf50785ce5e8cd40cdf197e SHA256 1e66df6a8c0ccae24df05f320b5142200fddccc959fe2b6d1796b09d59dde282
+EBUILD chromium-9999-r1.ebuild 14762 RMD160 09e5cbbede55b8e5ef40e22aaef5017851ab0737 SHA1 28eb459db78ee02acde18a679b649a69662535fc SHA256 21d54bf7871f43cf17099597e54d740c5591ee171128866299bf544a9dadbe39
+MISC ChangeLog 20197 RMD160 3777c9f031881f048b3d0610687d5c42cbbe1e36 SHA1 02032ca011b26fa3bb6721e2859c82b3d74a1fe6 SHA256 bff14f2cd3e2e38ae3b2701dfd4399efcd1269bcd197560cbc298cf716f37497
 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)
 
-iF4EAREIAAYFAk+oDgEACgkQC77qH+pIQ6TTzAD+PBNanv2KYzs9kN8UDiUUpqn7
-UU9/J6/WrADfHxj93+IBAIACZTu+Xo2dFvQ/10qwC6NVQNlLI3RRYbCsWoGrf2EE
-=a/mB
+iEYEAREKAAYFAk+qeMIACgkQuUQtlDBCeQLt1QCfYANnehcOq3zejoMOj0m5q/rJ
+nK8An0iyXCT1I9AJjcZBwCvjaCMqRR9D
+=yeIU
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-20.0.1123.2.ebuild b/www-client/chromium/chromium-20.0.1130.1.ebuild
index ff1adcceb451..6ae69e63932b 100644
--- a/www-client/chromium/chromium-20.0.1123.2.ebuild
+++ b/www-client/chromium/chromium-20.0.1130.1.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-20.0.1123.2.ebuild,v 1.2 2012/05/07 15:06:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1130.1.ebuild,v 1.1 2012/05/09 13:58:33 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -107,6 +107,8 @@ src_prepare() {
 		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
 		chrome/common/zip*.cc || die
 
+	epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -334,20 +336,10 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	# Install Native Client files on platforms that support it.
+	doexe out/Release/nacl_helper{,_bootstrap} || die
 	insinto "${CHROMIUM_HOME}"
-	case "$(tc-arch)" in
-		amd64)
-			doexe out/Release/nacl_helper{,_bootstrap} || die
-			doins out/Release/nacl_irt_x86_64.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-		x86)
-			doexe out/Release/nacl_helper{,_bootstrap} || die
-			doins out/Release/nacl_irt_x86_32.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-	esac
+	doins out/Release/nacl_irt_*.nexe || die
+	doins out/Release/libppGoogleNaClPluginChrome.so || die
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
@@ -375,9 +367,7 @@ src_install() {
 	popd
 
 	insinto "${CHROMIUM_HOME}"
-	for x in out/Release/*.pak; do
-		doins "${x}" || die
-	done
+	doins out/Release/*.pak || die
 
 	doins -r out/Release/locales || die
 	doins -r out/Release/resources || die
@@ -385,11 +375,6 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	# 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}" || die
-	# dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	# dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
 	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 1b9080cd0760..1e32417bcff5 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.109 2012/05/07 15:06:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.110 2012/05/09 13:58:33 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -392,7 +392,7 @@ src_install() {
 
 	doexe out/Release/nacl_helper{,_bootstrap} || die
 	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_* || die
+	doins out/Release/nacl_irt_*.nexe || die
 	doins out/Release/libppGoogleNaClPluginChrome.so || die
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die