Version bump for beta channel release. Fix a misgenerated desktop entry. Remove old.

Package-Manager: portage-2.1.10.3/cvs/Linux i686
RepoMan-Options: --force

6 files changed, 38 insertions, 25 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e1547415fb66..9a28bfc9fc4d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.408 2011/08/04 21:21:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.409 2011/08/05 21:10:59 phajdan.jr Exp $
+
+*chromium-13.0.782.109 (05 Aug 2011)
+*chromium-13.0.782.107-r1 (05 Aug 2011)
+
+  05 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-13.0.782.99.ebuild, +chromium-13.0.782.107-r1.ebuild,
+  +chromium-13.0.782.109.ebuild, -chromium-14.0.825.0.ebuild,
+  chromium-14.0.835.15.ebuild, chromium-9999-r1.ebuild:
+  Version bump for beta channel release. Fix a misgenerated desktop entry.
+  Remove old.
 
 *chromium-14.0.835.15 (04 Aug 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 06682785590c..1701f78d150f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,22 +19,22 @@ AUX chromium.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543b
 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
 DIST chromium-12.0.742.112.tar.bz2 151384207 RMD160 13d9092d79a324852b60e42979218f989000cad1 SHA1 181be3b00386d70e7cc8db88c4e782960a8d4e30 SHA256 b19ea97a7def45c9052ead5ad9f171a3ea1df29c17a5d237e0b78bdfdcefdfb2
 DIST chromium-13.0.782.107.tar.bz2 155319932 RMD160 30b592cb0db7128673682eb9d5bb0bc9bc4b83e8 SHA1 e4b6f33799dc92ea9145afa099d74cfe8f0de481 SHA256 4dcccc29d4da6eb154c2d419ff8637ee190203e15cc85051294f06ac3db9fa04
-DIST chromium-13.0.782.99.tar.bz2 155452601 RMD160 d562f6d222f8388aed111a0dbeb21375ce50d3d9 SHA1 fac87212b805ef343f398ffcf0bbf93108390d2b SHA256 5bceb6c7dce28573be6e1967e37cc8fc27fc83ff63b15e75680931d3d683fcdc
+DIST chromium-13.0.782.109.tar.bz2 155320890 RMD160 4a42afd1eb7a9f97c4d8207fdf4e2b96b632d8f4 SHA1 2e5df16b074501c851524f2b9c1fa25705740fe4 SHA256 9e0292c5d94eac534fc5078c92547a4f8c0c59e5a8474ea7a39000515c347971
 DIST chromium-14.0.825.0.tar.bz2 202446439 RMD160 7ddecf1714910e2780a683e547ac409cf65bb7ff SHA1 998488b13966be72764442509d915613bb4949d8 SHA256 d4e12b545cb52ec9074a9278eb7e9fbd35f1460b4a5fcd1443616e5dfea12269
 DIST chromium-14.0.835.15.tar.bz2 160030122 RMD160 580b75168420a837c3b03dd6c02bad4d7514583b SHA1 bdc6da9bc3327b61d18e65c940630976adb51d78 SHA256 bb2ddc904474c37ed9d033c000c3f6fc9a80442dbd464aef9b4a5647a0e817c5
 EBUILD chromium-12.0.742.112.ebuild 12047 RMD160 ab3c47a41ff2d69f7d53eab715c9151ed848ea1d SHA1 37012697cc4a0f29558614ebd5aadf476781ee37 SHA256 ebf99c4485e6e19eeeca8fcfefe5de7864497c1d6a3d4fb6c40076bfa9beee33
+EBUILD chromium-13.0.782.107-r1.ebuild 13212 RMD160 489bfd4bfc552a5df0f8026a97f4412543a635b2 SHA1 ab1d0d9fdda75b3ec91edb88573664d6983ec15e SHA256 145464570bc15e0ac962b625d84324738d44af5bdc4437ee2b28e7cb5266166c
 EBUILD chromium-13.0.782.107.ebuild 13205 RMD160 240b7b4a96e9626897b267d755858fea6bbb41fb SHA1 cf1d8bae483997a42490abf9d716d71852a7a817 SHA256 63284a4f6be456c4e9ae80b0ad6e92d3dce61d2a7bb040c2edcf1e48e24032b3
-EBUILD chromium-13.0.782.99.ebuild 13207 RMD160 33a552ca00fb8b89cb6310b3d346075c245b36ed SHA1 1188c073bf1b9b08d74e459b4bb86417a36b45ad SHA256 ad47c1c427dab5941a1c60d20354cfe795da377313619448784b449b835f185f
+EBUILD chromium-13.0.782.109.ebuild 13210 RMD160 78efa41ab0bc8ea9adb199993bce1fd6547b52ce SHA1 1047105b295d04fa6d24a439c7d0a7fb55982db1 SHA256 52a93acdabc063b90d19c166ef07397c21356d4762435875bfa14d50fe33d6ae
 EBUILD chromium-14.0.825.0-r1.ebuild 12956 RMD160 6f362ecdcc62cd1bfaac1fb669aad0aa58753263 SHA1 89eda9a0db738d2b4af22f7f299db2ba8ce3bf33 SHA256 aa73336d33777a800be609466595da3ab6b780f03e77ed562e06c8958a263198
-EBUILD chromium-14.0.825.0.ebuild 13091 RMD160 e7da0ddcdaff742120952b44987bd2d551f43735 SHA1 64b2dd14c219a878ebef2ea64f9a18d744fae89e SHA256 443dfc6227d6811936c1dbe380ec13f508fe97815685d461426832e68f516c2e
-EBUILD chromium-14.0.835.15.ebuild 13066 RMD160 824e3a87ea50d2eed832bd100559993b98b29026 SHA1 a1a1b51cd5721c0fcc7dd6e019cf2797d1572a8b SHA256 7f75169d7a09554c271c8a7c3f1bbfe073b2cb3c5b2b32a0b0b3b5a82efc80af
-EBUILD chromium-9999-r1.ebuild 14993 RMD160 be0ab3ea6639ddc92afc06c612b8ca9be3fcf1e6 SHA1 879a989b8c5157a66eb655df09090fa0e4452d6b SHA256 0126c6af7ed4b707c5f40296f62752cba99512a257045608a98241e454f7aa46
-MISC ChangeLog 90904 RMD160 7c9a67adabdcd6ae6ad4b7b793c7da654adc427a SHA1 98b42728f04c4eecfff4e871e0381da8db58f199 SHA256 5e900e2a737150cb2824bc3ac0cd26fe9674e5f5abd7e31996809fd835a8762d
+EBUILD chromium-14.0.835.15.ebuild 13068 RMD160 70608b666a9b7bd78df5ebd2fae84039b434fe89 SHA1 985869a16c914c29493fbf46b8abb1656dafd21d SHA256 08ad00084e6e036393cb8a72b37d0b567a791227dd44d4f88db4d805e5fa39d7
+EBUILD chromium-9999-r1.ebuild 14995 RMD160 9299839ad84cf7660c67d6603e34b5701deacc9d SHA1 5df500c71fde454100ed7ca3c6e87ed6a5b89f55 SHA256 e4a607c50b9a1dd23ebd4e52c69e87faa614e87f76b7dbb993a6d643c83af734
+MISC ChangeLog 91311 RMD160 72a75995a81cc63a334cc88f7f939b02a0d75d3a SHA1 b67cfc3bfe11fc0cf2f19a5db32e27363f3fb7a8 SHA256 e037db8d09c80ddd4b6c6feaa68a7d62c4400980fe53ebcc760d19fc1e3e6b53
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk47DXIACgkQuUQtlDBCeQJT9gCfeBXZ2TYJ+Z/lnDfWybS1iynD
-Ck4AniW2/6GWBBtYOxxs+7B5E6OFJKWL
-=dlaR
+iEYEAREKAAYFAk48XHUACgkQuUQtlDBCeQIj5ACdFJKIoBbj+ZA2Rswo8/89jSld
+QhEAniAZx6QWwyOkqNx4lu4JcpkodAtk
+=Q+yk
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-14.0.825.0.ebuild b/www-client/chromium/chromium-13.0.782.107-r1.ebuild
index e70b61f4d73d..0c6282d5fd04 100644
--- a/www-client/chromium/chromium-14.0.825.0.ebuild
+++ b/www-client/chromium/chromium-13.0.782.107-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0.ebuild,v 1.4 2011/07/20 12:02:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.107-r1.ebuild,v 1.1 2011/08/05 21:10:59 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -14,8 +14,8 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring kerberos"
+KEYWORDS="amd64 ~x86"
+IUSE="cups gnome gnome-keyring kerberos xinerama"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -44,7 +44,6 @@ RDEPEND="app-arch/bzip2
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
 	x11-libs/gtk+:2
-	x11-libs/libXinerama
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
@@ -55,6 +54,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
+	x11-libs/libXinerama
 	test? (
 		dev-python/pyftpdlib
 		dev-python/simplejson
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
 	)"
 RDEPEND+="
 	kerberos? ( virtual/krb5 )
+	xinerama? ( x11-libs/libXinerama )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -115,12 +116,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# bug #374903 - ICU 4.8 compatibility
-	epatch "${FILESDIR}/${PN}-icu-compatibility-r0.patch"
-
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
 
+	# Backport build fix for perl-5.14, bug #372301.
+	epatch "${FILESDIR}/${PN}-perl-5.14-r0.patch"
+
+	# Backport build fix for glibc-2.14, bug #372495.
+	epatch "${FILESDIR}/${PN}-glibc-2.14-r0.patch"
+
 	# Fix build without libgcrypt, bug #373079.
 	epatch "${FILESDIR}/${PN}-libgcrypt-r0.patch"
 
@@ -154,7 +158,6 @@ src_prepare() {
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/zlib/contrib/minizip/*' \
 		-delete || die
 
@@ -375,7 +378,7 @@ src_install() {
 	local mime_types="text/html;text/xml;application/xhtml+xml;"
 	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser"
+		"Network;WebBrowser" \
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
 	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
diff --git a/www-client/chromium/chromium-13.0.782.99.ebuild b/www-client/chromium/chromium-13.0.782.109.ebuild
index 65effe30fbed..b9d5fb4248b9 100644
--- a/www-client/chromium/chromium-13.0.782.99.ebuild
+++ b/www-client/chromium/chromium-13.0.782.109.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.99.ebuild,v 1.1 2011/07/21 03:07:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.109.ebuild,v 1.1 2011/08/05 21:10:59 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -378,7 +378,7 @@ src_install() {
 	local mime_types="text/html;text/xml;application/xhtml+xml;"
 	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser"
+		"Network;WebBrowser" \
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
 	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
diff --git a/www-client/chromium/chromium-14.0.835.15.ebuild b/www-client/chromium/chromium-14.0.835.15.ebuild
index 6e698d08709a..6dfe6b83c043 100644
--- a/www-client/chromium/chromium-14.0.835.15.ebuild
+++ b/www-client/chromium/chromium-14.0.835.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.15.ebuild,v 1.1 2011/08/04 21:21:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.15.ebuild,v 1.2 2011/08/05 21:10:59 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -374,7 +374,7 @@ src_install() {
 	local mime_types="text/html;text/xml;application/xhtml+xml;"
 	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser"
+		"Network;WebBrowser" \
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
 	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 3c9bc3de74c1..cb90e847a692 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.40 2011/08/04 21:21:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.41 2011/08/05 21:10:59 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -403,7 +403,7 @@ src_install() {
 	local mime_types="text/html;text/xml;application/xhtml+xml;"
 	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
 	make_desktop_entry chromium-browser${SUFFIX} "Chromium ${SLOT}" chromium-browser${SUFFIX} \
-		"Network;WebBrowser"
+		"Network;WebBrowser" \
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
 	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die