Version bump, fixes some race-condition crashes, and maybe fix bug #295756

Package-Manager: portage-2.2_rc56/cvs/Linux x86_64

3 files changed, 30 insertions, 23 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0b494728aada..53c204325135 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.29 2009/12/02 17:14:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.30 2009/12/08 12:14:48 voyageur Exp $
+
+*chromium-4.0.266.0 (08 Dec 2009)
+
+  08 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-4.0.248.0.ebuild, +chromium-4.0.266.0.ebuild:
+  Version bump, fixes some race-condition crashes, and maybe fix bug #295756
 
   02 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
   +files/chromium-use_system_libevent-1.4.13.patch,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b7a88f90dd64..ecd6dc4186af 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,12 +2,12 @@ AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
 AUX chromium-use_system_libevent.patch 7037 RMD160 97bbc89c749dea1cf8fc555dd055536745013d1c SHA1 54380af0c7a49c0c56c7d0b8c1970b3dffa7aa05 SHA256 cbac7bfab545fab11f1fef00437588bbd643f243168d160c8071422f1e37feeb
-DIST chromium-4.0.248.0.tar.bz2 136592064 RMD160 fbd155a01b296103144385ed156ff5b18c5d6e4d SHA1 a3916994e2ab8098124994d10dc01c9b063fa70d SHA256 635d762c63f56f79ab13c2279606ec7a7e8ae6b25e766c94351b0b93589c1565
 DIST chromium-4.0.251.0.tar.bz2 133265804 RMD160 250d12cab201f53ff87b89c2e4b5a031d34951e8 SHA1 1e8d0e3c4defa13922f898f9612804dd347114f5 SHA256 db6a1a4d1547467bf95f49d175de0644f9917067b2be1e52931d692eba7d994e
 DIST chromium-4.0.260.0.tar.bz2 134032408 RMD160 6b390458306572f473b4858c8a06fb9cf8f724e0 SHA1 896ffbc613b8d75aeee3de0b3839aee086755556 SHA256 d09986e89b431476005333d00a1bfb8b59f5c7edcaf3781e6a8251468786c7cc
-EBUILD chromium-4.0.248.0.ebuild 4179 RMD160 72a02b1782b2c4f13088cbf52816ac46c0141975 SHA1 fc5bfdaf9179ac15089811e115c77896ce628995 SHA256 4782bb1aa863c87fdd1d19d698d8ce4564bba4fcf71cb5f18a0bdc1e9659090a
+DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63ed82251994 SHA1 65a8e7496f26b6c1bf663199d77fe238418f8250 SHA256 df0bce0541041c6d22ff177b4ea9cfbeee0c18d0805f1d371e6442688f42577f
 EBUILD chromium-4.0.251.0.ebuild 4236 RMD160 c5997b5fc9fc2b394469c3d0ca6fe954659b0da6 SHA1 6ee4a87e064368631767f2d8c89230d5dd692473 SHA256 63ff133a9bfcca4ca37885a6ed3f1f536df246c143311f675af1bcecfeae73d1
 EBUILD chromium-4.0.260.0.ebuild 4223 RMD160 1b0767f025db21877cab4d7638e01e010ad92b03 SHA1 af22b3ef16f4e18bc05ae7cf335d99210a6b5510 SHA256 a5824b574bf8a7701f77f65a62a6a9d133786c38b9ee3fb86bec7fc0df766e14
+EBUILD chromium-4.0.266.0.ebuild 4223 RMD160 e8a790819f6129e8e2e8cc771874ce94069ae371 SHA1 d709d5bf820628a3cc9130da6a552e78f38f0ecd SHA256 eb9e62e4c9a3dd48214d08b5e842e27236183a8b40a2908af329b5bc10d3c508
 EBUILD chromium-9999.ebuild 5961 RMD160 91e5385324554740eb332fb4758012c11614a679 SHA1 b5c33ca819b41b090280bd7ffd63d785b3e6898a SHA256 d9c6f6658f9832ea91f1c59a33cd2b90c19a3c2fee7676ad21224642b310a0f2
-MISC ChangeLog 6646 RMD160 12451f82d8c10508c01c08fbcf4729f8a73cdd19 SHA1 82895e5f28cc9307c7e1ac0ffad004296e2c1b36 SHA256 21ec826cfedcedf6eebd899952eef53b9c72d6354af8ef2eaf6855c0afdcb0d7
+MISC ChangeLog 6872 RMD160 a45f9a16f0e44db17b45277b7cce8d3c71e8d3f8 SHA1 d4bcb8ec0f1ca0795df8a951ea058abcba3d53a5 SHA256 b8f803a59032789a324a79c5b3422649cb1e753f2656f2aaa6dd4ddeea21cbf3
 MISC metadata.xml 482 RMD160 f426cbc83d5b780c7fbb40bbda4dd332d95a8835 SHA1 56486139b7d1bb63d31cb146672fa88405387969 SHA256 b32aa557e06fec6a5e2b838ced4bb8e7504369d8dbb78a1b87f1c385b646e552
diff --git a/www-client/chromium/chromium-4.0.248.0.ebuild b/www-client/chromium/chromium-4.0.266.0.ebuild
index 46bbf0a911d5..2f9d5ab275ee 100644
--- a/www-client/chromium/chromium-4.0.248.0.ebuild
+++ b/www-client/chromium/chromium-4.0.266.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.248.0.ebuild,v 1.1 2009/11/15 23:26:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.1 2009/12/08 12:14:48 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -13,22 +13,22 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+ffmpeg"
 
 RDEPEND="app-arch/bzip2
+	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2
 	dev-libs/libxslt
-	>=dev-libs/nss-3.12.2
+	>=dev-libs/nss-3.12.3
 	>=gnome-base/gconf-2.24.0
 	media-fonts/corefonts
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg
 	media-libs/libpng
-	>=media-video/ffmpeg-0.5_p19787
+	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-themes/gnome-icon-theme"
-#	>=dev-libs/libevent-1.4.13
 #	dev-db/sqlite:3
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
@@ -37,22 +37,20 @@ DEPEND="${RDEPEND}
 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
 src_prepare() {
+	# Gentoo uses .kde4, not .kde
+	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
+		|| die "kde proxy sed failed"
 	# Changing this in ~/include.gypi does not work
 	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 	# Add configuration flag to use system libevent
-	epatch "${FILESDIR}"/${PN}-use_system_libevent.patch
+	epatch "${FILESDIR}"/${PN}-use_system_libevent-1.4.13.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
 		-i third_party/{,WebKit/WebCore/platform/image-decoders}/zlib/zconf.h \
 		|| die "zlib sed failed"
-
-	# Display correct svn revision in about box (if not a release)
-	if [[ "${PV}" =~ "_p" ]]; then
-		echo "${PV/[0-9.]*\_p}" > build/LASTCHANGE.in || die "setting revision failed"
-	fi
 }
 
 src_configure() {
@@ -69,8 +67,7 @@ EOF
 	export HOME="${S}"
 
 	# Configuration options (system libraries)
-	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
-	# -Duse_system_libevent=1: http://crbug.com/22140
+	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
 	# -Duse_system_sqlite=1 : http://crbug.com/22208
 	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
 
@@ -115,13 +112,17 @@ src_install() {
 	doins -r out/Release/locales
 	doins -r out/Release/resources
 
-	newman out/Release/chromium-browser.1 chrome.1
+	# chrome.1 is for chromium --help
+	newman out/Release/chrome.1 chrome.1
+	newman out/Release/chrome.1 chromium.1
 
-	# 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}
-	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
+	if use ffmpeg; then
+		# 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}
+		dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
+		dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
+	fi
 
 	# Plugins symlink
 	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins