Stable channel bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 19 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index aa6e18329add..f518c40d0e43 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.834 2013/03/07 20:51:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.835 2013/03/08 16:54:25 floppym Exp $
+
+*chromium-25.0.1364.160 (08 Mar 2013)
+
+  08 Mar 2013; Mike Gilbert <floppym@gentoo.org> +chromium-25.0.1364.160.ebuild,
+  -chromium-25.0.1364.97.ebuild:
+  Stable channel bump.
 
   07 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-27.0.1430.0.ebuild, chromium-9999-r1.ebuild, metadata.xml:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 97a35dd49d41..bb32e386c6f8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -21,27 +21,25 @@ AUX chromium-system-v8-r0.patch 397 SHA256 9b69099db82e3d4def410f887eb0b0b9006f4
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
 DIST chromium-25.0.1364.152-lite.tar.bz2 125551576 SHA256 ff575ac5abafa370bb10b21cb7f542a1d27c399d7ce199b8eb61f814e8067af3 SHA512 c611943baf1723bd9adb51550315cc1e0d575582a89d53a992d79de33d1001acde50442c337cbecdaef2a35a522017423c257b77c7667c2ffaa8a2bb785872d1 WHIRLPOOL c87a3ed087e06396570f30bf86c74bc661fae8448f35744ea4d085d82ae8516061820a84b519fff777613a60a399fa23eb2183667a27714adb001a9634005172
-DIST chromium-25.0.1364.97-lite.tar.bz2 125698044 SHA256 f39861718cc1a0bde0ffbe15ce7957404881f0881640eb3fd2f92e2f344a20d2 SHA512 7bc1f3cd31059aba3ed12e89b90139f2dfefb0b7a57557372602eb14281ff64d259f0b973c37d7c4e2d12af1698b3a701115c7d4b8ca3e6cc104d7edcbf2a5ba WHIRLPOOL 56dad03ffc44f25170d220794b46a545fb6a5ad19670ed5ef3d855a39e77aea917032838cfa4c377db716ef5cf2701bc7eb70bbf4c545317ccebc4f536222a8d
+DIST chromium-25.0.1364.160-lite.tar.bz2 125544021 SHA256 e16a1f103df9e9054e7ad341037842a71214f2e8ac5e6ae3e0a64dfa10297a3e SHA512 0d4aabc3960e59b169e8868d7005788f7272f7ca8596e165534f53135feeabd30fd2b7b0787fed5d06b23db5e1530f0b1e4b4b63dfd3aefa49f2e2408798a1f2 WHIRLPOOL 696d5458a56dd5e4686d91e91440e5ab0be4f389691b4affac987f9f54fe4c9c9e58853a75426e01a059cb1cb74f8384832df471f2bb2438f401e011d1859267
 DIST chromium-26.0.1410.12.tar.xz 140786668 SHA256 b242b2c6e1d65cf3582e7e164bb2b6717e9d49cbeb17edb91ca5bedf28dddfb1 SHA512 b47e6dd6df3b14c4aaa2daa48eb50f57b3e766ae8f6702849e2aec9cc5963f567e46813df7f3472c5db9582dd2b97667634361b2a6094a11189d8a5a6b547517 WHIRLPOOL 764d37e67aede3f864e543b3574623929198699e736f047b023aad4b0c48d8086a5c74c2e9744ecbd878a58c5dbec3b9a3caad8df894035c7cefaed30d1d64af
 DIST chromium-26.0.1410.19.tar.xz 140798820 SHA256 f901cc35c76995d7d70d50c8d20a9a2f3667d3fbc72ad9d43d4ef5a826881e2e SHA512 09f5c4cfbe9c15edc4a2a42fe91f711fdbebb30920a9dcd10b2344f3fa23b04adca35296e4c4618601806a29c4622cbb28255f5feaff89c9fc85f41393493ba9 WHIRLPOOL 0e7d5361a900530660c33f4d1528ecea53c991c6fc24948b401af4bb1c30edc79833f6784e30777dada7caa8f15754f324a744be835dbadefef4f59cc5521c2c
 DIST chromium-27.0.1425.0-lite.tar.xz 106076024 SHA256 9ca878cdb15b70f9d16dfe216263fd46bc0e017cec3d6252a58325bf862202b8 SHA512 ab409c89d1f1e704cd6a3b0797192ae466611429fad3de34d3800506c3994b3bb3c72322ad6655f2c6af38b7b36814764889b16081fabfe896ab3a807b015a03 WHIRLPOOL 5f76a971b560060672fb739e9677dfa0d5f70c0868e903e2f56447e8ed24cf5eb84da1be4686b1f5d3c74792eb09fe2766b701dbf03d0017024a26f56264a444
 DIST chromium-27.0.1430.0-lite.tar.xz 106375492 SHA256 163052accc62d2fd741782c0e9a025efb43d75414f1e56fe264a5062d3e11f82 SHA512 6d7358ef82db498b312c1571ab9179a7a7f7fe3642e3f084db4c1c76ee481e8a14da34bbc23734a28b87be29e859ef1b1500cda2caae9ad98f0b53345d426490 WHIRLPOOL b6ba7d53fd446ee0370d7237baa41e86be8fcf79ba390ff4c6db05d87afe6ca002715fd2167600732147dc87c9017c19bb55c62938800fd9023302ca1f3aac4d
 EBUILD chromium-25.0.1364.152.ebuild 16261 SHA256 0b69d780b235b5c68e7b5d738e0e0349f4df0e43fc69160ce7397fa84c514a60 SHA512 5da8b071721595524118bf71087b2af5287aefb380de8b8672528cf32d845e5a921f7c7b165fd82cdf5860c5745f52825757f8e11e0d3140098db8b4da0904e3 WHIRLPOOL a96c8f4365efd521e7fbe0834a5fb40312429b4e9235b3d5b5a8ff2ebdeaf10ee65194e684a525d890f43ed3a1babe07e9fdebbe22bd1ea660f8a83f7e5fd41c
-EBUILD chromium-25.0.1364.97.ebuild 16217 SHA256 e24e128b98d30457d34f87eea73cad3bad3149dfcb34ee27d59279fac277516d SHA512 5e718c82d9653719df8ec4bb23781ec593a25c349f68316cb2591f2797e3baa5674ccc22b8c6e5ac5eb6657ba62a3b422c8d9ec958a7eb8f7b7542c6a57921e0 WHIRLPOOL de343741d0bf1160b27abc02b65d971c4acb73c3aabf17215e20cf6bb3048d78f52c4ff634a66c2ee363b3b5285c21ecf0da7e0ba12be13f7cbc35140560c711
+EBUILD chromium-25.0.1364.160.ebuild 16263 SHA256 ca6c948158501daf20d3f41e75c63dbda7b5a4a41e864cb666a9efcaa46e7b44 SHA512 3869346b38ead49ad0a608d6ad19d45b1f3e61a81087b6ce16b10327bd2634390b75323ef406ec539c03990961cd8ae304e4528c161141e45817a9011aa9a7c2 WHIRLPOOL 66db97c1b193c77983a3fd88002b4d622b429828cc8686f8f8e4c91445fc445c02bb267cfa1c043ba394b465f6a45852ced6221a1a0fd53b2994cd8e2388d4dd
 EBUILD chromium-26.0.1410.12.ebuild 15857 SHA256 f65b8e135a2e43797cd676c37ea47d0edc202594345161be56aee864c630487b SHA512 9f256362ddba0bdf87dd51d2c06069374c58eabebc0d687908c12df180ed885b8dbabab75bad6e974c4cd34ea54b0b21acff6f42a94693f95bc60368ac415d21 WHIRLPOOL 0974bf5a2e10501db2346b14634d55bc41eb501c64e900bbe295436c21d83e1a457c8b53dddeb0bd078fd3fdfc2e16b2e9815d178f5be36d1ae73a4a2b6726f8
 EBUILD chromium-26.0.1410.19.ebuild 15950 SHA256 def1687bd37a0d95114e47546293c6803ce05f6dd41f66fef9f5999a48d990b4 SHA512 248d40dd20e2df6df181a02cb477d72506c2ae34dc7ed0db8b7f6336ff6fb3e256143f189c510a82a320dc0af39e540b6f2dcc3a383431c7cd5e98c6f59282b2 WHIRLPOOL c20486559e50a72dae0d062cd6d29c4844fde34ecc7f449b686575008edcb76f3481747055bc7138ecd07c98e42d0c843e5bb478e84d1999a21e208337574e14
 EBUILD chromium-27.0.1425.0.ebuild 15918 SHA256 61fa81a77b52eb24ab1dd921340d99023aaca5ec22b738da860f65a607ff97e9 SHA512 62d27fc9e016b17940ec784761e050bba67aa7878d42027f2ce7fc1a4a492a402a1bafc6773cf57e15aaa9664b967679a5ddbe7a4dcc18f65bbff95d838afb42 WHIRLPOOL cd73e6d2ad559a6e45c98bdb48d894f2e587ea31bfc028d0afc78cb580bfcc9af737cc25af2a890c57daadafa69c4bbf1a676bbd4895edd21adad8342f42d21a
 EBUILD chromium-27.0.1430.0.ebuild 16267 SHA256 e74107954869d1b344eaa0082b0dfc6c01f5e034afc1c93b85c48b111ab81e0a SHA512 d8c63dc03ff86b964e073ff44e4578a871ba0ef3970d62e8617ab2cb84e24d95891d1a79cabfac25e9ea98c3eaa6e01feddb71b6e503e10005333e287fecd57b WHIRLPOOL 2798be071200ca69ac2e9f175eb1072d61be78b7bacab965800b8e15856ab8f2a35c350a285f1f93851f9969b73b87e07b3f3e9995ec17ec9435b815c72ebc1d
 EBUILD chromium-9999-r1.ebuild 18005 SHA256 37f8aa895a35552af340c175327b741dc481c117fa3120061c25bbad42b80c63 SHA512 c74446c1d300034900736d00189c8bd76840f39908c862626ea55b438e0fc1db5bf1c2365fcdfd54ed088ec32d3ccee3886d7a597218e29dd0dfba2f149eec18 WHIRLPOOL 989e0a7468c0e80a1169cc8c56cf36304b530a3e76c516f7b9cb3fe59c443daf3f65520c909fa00e7873a8617cb50317450192a6a7112ea13976fb59543ab886
-MISC ChangeLog 59345 SHA256 b2b533650c66f53e2525a108bc486bcfde9bca5b777ac1725038bef13b3bd5c4 SHA512 26aaeb33628d745d54dbb5dc45e293c9d3d9739a2c60c3d7ea7f9994d49d8615b22ca9067bdd23f8bbfb116e1e660693a4c7645967d1c6d62a3d864205171b32 WHIRLPOOL 597ff22ecced7ea65980be3a97335ecfac8b3e695263727bdfa71ae4629bb5ea51a8be03c7ad3189c8e5569709a5daebdf5ef16672dc039a11fc261a4bb03fce
+MISC ChangeLog 59519 SHA256 0af2a77ead102335c3f1b43d9781341858d514dbbe9d45d6a91c8dc36e889ce7 SHA512 0fdeabc7fc564556a7555a7f01421cd5854871c4db560967b7d321f906cf524e7983611947460e462df651913b14925c3483ec25979c80b09f1461ad64efe29d WHIRLPOOL 5264307c7fbc7b16d2b925ba95e0e678cd891b08df7685b5827d9e0370e6f7335af53a4b07f91545cef15ec389eee6b42f98a4ccdadaea642f50f8b1baacde5b
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC chromium-9999-r1.ebuild.orig 17686 SHA256 9cd4d15c92c01831902949ce6fcabfce7bfdf35d29493dc4b4d01e9233ca3723 SHA512 1f6f272ffe95bf633f005510107bd2d94e2e337d181f1828658d82e13f0142a364cd7a109419e5a8c9a18b82e0ecd5a7277acbb3c742e596c9c635573acb8515 WHIRLPOOL ed5e0f0a6b1e45d62d431643dc2d86bfb27c758ee04ef97c52983a83f68a5e3753d936d8427f14d39fa952f4fc96a6d3b1806b3dd4934a6b3c74d91e6e5280b7
-MISC chromium-9999-r1.ebuild.rej 800 SHA256 8c04bf66850f1077078ca467bcf2cdbcf1fcb4973c98786496c1863718bc9ac8 SHA512 2cf922a93a0e68ab885c06a8ab24018a27250b827cc5ab9206ab1b467038ed6b7423b70944b275befa124d5cf1192277c6b001ecdc28d0c3ebbcc50066cedd00 WHIRLPOOL 1b7aa19a226038375cc3a515c852b28ea07ccf90e3ee789735614801284a046b7328bd73bb95babd20bcb133dfad944e01685c67d088a4c640036d5e389af995
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE4/fcACgkQuUQtlDBCeQIa1ACeIwOMRRwAeHLF33bW5X6t9iz2
-4MQAnRhJ6J9bq/5guIN8VU46IgUDsXAq
-=qy1v
+iF4EAREIAAYFAlE6F8IACgkQC77qH+pIQ6QdVQD/c8Mnw1t1brIRCTw6M7IVJw8K
+GKCJokUgPyG9bNM3bCsBAKPCg78LbmXSoUUwssGMmp2Ms78HrrdhZ7m7A7+NlWMQ
+=ILhD
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-25.0.1364.97.ebuild b/www-client/chromium/chromium-25.0.1364.160.ebuild
index 90fb5ec004b5..f71523dbfd75 100644
--- a/www-client/chromium/chromium-25.0.1364.97.ebuild
+++ b/www-client/chromium/chromium-25.0.1364.160.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.97.ebuild,v 1.3 2013/02/22 12:09:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.160.ebuild,v 1.1 2013/03/08 16:54:25 floppym Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc"
 
 RDEPEND="app-accessibility/speech-dispatcher
@@ -35,7 +35,7 @@ RDEPEND="app-accessibility/speech-dispatcher
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
 	>=dev-libs/nss-3.12.3
-	dev-libs/protobuf
+	dev-libs/protobuf:=
 	gnome? ( >=gnome-base/gconf-2.24.0 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
@@ -49,7 +49,6 @@ RDEPEND="app-accessibility/speech-dispatcher
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	system-ffmpeg? ( >=media-video/ffmpeg-1.0 )
-	>=net-libs/libsrtp-1.4.4_p20121108
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/zlib[minizip]
@@ -183,6 +182,7 @@ src_prepare() {
 		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libusb/libusb.h' \
 		\! -path 'third_party/libvpx/libvpx.h' \
 		\! -path 'third_party/libxml/chromium/*' \
@@ -215,6 +215,7 @@ src_prepare() {
 		\! -path 'third_party/webgl_conformance/*' \
 		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/widevine/*' \
+		\! -path 'third_party/x86inc/*' \
 		-delete || die
 
 	# Remove bundled v8.
@@ -262,7 +263,7 @@ src_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
-		-Duse_system_libsrtp=1
+		-Duse_system_libsrtp=0
 		-Duse_system_libusb=1
 		-Duse_system_libvpx=1
 		-Duse_system_libwebp=1