Version bump, enables bookmarks sync by default, allows again extensions to access file:// elements (adblock+), external libevent disabled as it crashes with it

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

3 files changed, 28 insertions, 22 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c0c5cceae859..35535dde0f4b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.26 2009/11/24 10:41:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.27 2009/12/01 13:27:46 voyageur Exp $
+
+*chromium-4.0.260.0 (01 Dec 2009)
+
+  01 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -chromium-4.0.240.0.ebuild, +chromium-4.0.260.0.ebuild:
+  Version bump, enables bookmarks sync by default, allows again extensions
+  to access file:// elements (adblock+), external libevent disabled as it
+  crashes with it
 
   24 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
   chromium-4.0.251.0.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3b29491ff17d..1d8cab03d023 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,12 @@
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent.patch 7037 RMD160 97bbc89c749dea1cf8fc555dd055536745013d1c SHA1 54380af0c7a49c0c56c7d0b8c1970b3dffa7aa05 SHA256 cbac7bfab545fab11f1fef00437588bbd643f243168d160c8071422f1e37feeb
-DIST chromium-4.0.240.0.tar.bz2 136243212 RMD160 23df5533fe91f96235154e9853f5f5a7d6c4b61c SHA1 69c161cc7dcbd11eb5cc465a17e626748943a2ea SHA256 d8c63916fd0dade512443c395e8b6e1da3f6c61932eaca45e83b3e5be835d800
 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
-EBUILD chromium-4.0.240.0.ebuild 4179 RMD160 6b4980a31e3423e02b7b993dab265d04bfd7e53e SHA1 7502cdd2b104fbc26f69156d45fbf57b43e45158 SHA256 29213344f3e7f389934888b17fbafa6156b8e3bfa2c0b559bed1fc28386b54dd
+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
 EBUILD chromium-4.0.251.0.ebuild 4236 RMD160 c5997b5fc9fc2b394469c3d0ca6fe954659b0da6 SHA1 6ee4a87e064368631767f2d8c89230d5dd692473 SHA256 63ff133a9bfcca4ca37885a6ed3f1f536df246c143311f675af1bcecfeae73d1
+EBUILD chromium-4.0.260.0.ebuild 4061 RMD160 ab28164c7ff890d625b8c0b33b9545f47510d9cd SHA1 ac25c01e0b07f0fa9dcd723052de88608b2d13e9 SHA256 c85b2604bd3b247c540f357db074c53fc72dc57fe6d57dc92f7193902c3c19be
 EBUILD chromium-9999.ebuild 5953 RMD160 fb4ebdc8186fe2a1f4d14c8c0a856cd6c42d9dfc SHA1 9a59bd124fd50580347c3f3da30f31d138cc78c7 SHA256 6081f8ff8ee068f0a921386fc3c96b0eb9008cca6a721d8daaa54ffb3272f3cd
-MISC ChangeLog 5949 RMD160 bb68465c0f9c430ed8de96f4719d105fc3a71e23 SHA1 23b650f03054b8ef314ea1359c27cda67458962f SHA256 cb630d45651278a2908ba6138c4c7dd58849cb8f172aee06982922f2cc591c18
+MISC ChangeLog 6265 RMD160 bfe2cc8ef82c6a4145f2c13c154843417ef26ec5 SHA1 8c265168408e020d6d7dbc6d147353b961e356f3 SHA256 4f9ebdd36ae3a1ea308317a06a7590d94aa80f9bf4d485188e32c5d569a05805
 MISC metadata.xml 482 RMD160 f426cbc83d5b780c7fbb40bbda4dd332d95a8835 SHA1 56486139b7d1bb63d31cb146672fa88405387969 SHA256 b32aa557e06fec6a5e2b838ced4bb8e7504369d8dbb78a1b87f1c385b646e552
diff --git a/www-client/chromium/chromium-4.0.240.0.ebuild b/www-client/chromium/chromium-4.0.260.0.ebuild
index 75114fdda231..aaf0e4e246bb 100644
--- a/www-client/chromium/chromium-4.0.240.0.ebuild
+++ b/www-client/chromium/chromium-4.0.260.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.240.0.ebuild,v 1.2 2009/11/09 14:55:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.260.0.ebuild,v 1.1 2009/12/01 13:27:46 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+ffmpeg"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/libxml2
@@ -24,11 +24,10 @@ RDEPEND="app-arch/bzip2
 	>=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 +36,18 @@ 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
 
 	# 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() {
@@ -70,7 +65,6 @@ EOF
 
 	# 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
 	# -Duse_system_sqlite=1 : http://crbug.com/22208
 	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
 
@@ -115,13 +109,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