Dev channel release bump, also include gnome default-apps file from pacho in bug #303100

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

6 files changed, 202 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ddfa3d502f76..ffe87187f57d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.48 2010/02/01 18:47:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.49 2010/02/03 13:11:38 voyageur Exp $
+
+*chromium-5.0.307.1 (03 Feb 2010)
+
+  03 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-4.0.266.0-r1.ebuild, +chromium-5.0.307.1.ebuild,
+  chromium-9999.ebuild, +files/chromium.xml:
+  Dev channel release bump, also include gnome default-apps file from pacho
+  in bug #303100
 
   01 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.302.2.ebuild,
   chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d40576b3d337..f07236d6df63 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,14 +2,17 @@ AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e1
 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-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
+AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-4.0.249.43.tar.bz2 140438366 RMD160 3a95c9ed343008245000fb5e691091ac033c2e55 SHA1 d98cb7787433446946601ed4ff4577d0b1e5f46b SHA256 ea6da2353a2c2a8eae3b13b9b86e44308ea6ae1f62b9594c346846f69fec25d1
 DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63ed82251994 SHA1 65a8e7496f26b6c1bf663199d77fe238418f8250 SHA256 df0bce0541041c6d22ff177b4ea9cfbeee0c18d0805f1d371e6442688f42577f
 DIST chromium-4.0.295.0.tar.bz2 152197504 RMD160 6465221e9e34c700efabbccaa5757bacf2295a9e SHA1 457c79a72b90a1fe0037db6503b66a55c5c2a4e5 SHA256 d78a7cb0cdf6914fd9f87786a9fa792944a2446ce8b5a6124bedcddd2d3a4cb9
 DIST chromium-4.0.302.2.tar.bz2 153073484 RMD160 d275f05b7d628bb0948eb287a19eecde012b0127 SHA1 c9940df87f2f2941f28606fc57f764e165d36504 SHA256 5528e637e8521d01093d69f0e7e880dd898941616caa6d7a361d467031d0b62d
+DIST chromium-5.0.307.1.tar.bz2 145224477 RMD160 43abe9d34dee7021467de4491888517b72c8302d SHA1 fb5f89f0fa83fd86c922592b6c8b7e1cd2dc9388 SHA256 5c1b3337fb3a8d72c5f00ae50e7d00c3d57188f2043b3c808ca17c8e194104e8
 EBUILD chromium-4.0.249.43.ebuild 4296 RMD160 598741039ddd6a997221b6b2bf487ed3f719d2e3 SHA1 0ba4d1cbebecc785fec2e497442923fcfb176596 SHA256 f87ad2ab9f07bd9883890a157bb02c5ad88177792d5f2f0f8db5d2c6b6610ad2
-EBUILD chromium-4.0.266.0-r1.ebuild 4798 RMD160 f2578cfd65430ae68c65eca07477d39cc81a9dec SHA1 b9ec2b4666ad333c05f98f8c4534af55185233e0 SHA256 cdc8a73d56bf26e9987ee4a7b68a69982cb28b58a2a7ada6a4b0cd575dc3dbb0
+EBUILD chromium-4.0.266.0-r1.ebuild 4998 RMD160 01ed0caddc4255d64cc56fb8cdeed5340fc6837c SHA1 e34d613edcc51b4ce3d03ee2f3cc6e07e97c4011 SHA256 1a18c31aa03431d5381c49740d3b6b99fa6700cd977a54b9493a9526eb64b346
 EBUILD chromium-4.0.295.0.ebuild 4685 RMD160 9208e3eacfa9e42d3db55c30588d2d6d7176bb33 SHA1 ef36b51af4af82d814872b396f8dd2a104f6f875 SHA256 869372f64d7b106da885da95f354fdba94962f561bbebabd11a1bb259bbf2e5e
 EBUILD chromium-4.0.302.2.ebuild 4701 RMD160 ad71556f5af113b004b774f7e072ed4d034b53b3 SHA1 8984ff50da33bf1dd0a31561e20fbd41d4a60f83 SHA256 f02d2630315620bf41905d68273b518a785de3c0e4b523aeb86daa15f063a1fe
-EBUILD chromium-9999.ebuild 6396 RMD160 bb3f2aa495001011e27fe83d07a8ac4e1d667f4b SHA1 0a6e5cba8ebc067ae425976bdd3b771dbc0a8c29 SHA256 4c0a38c426c38927bc4a896309b784d860b8f50bd7828bcac14e209e86d06a4a
-MISC ChangeLog 10805 RMD160 a4396a1b0a667ee58652e940d6e20eb42d741c1d SHA1 e878cafaf3d07ebbadc82eca60014a56d39c99a9 SHA256 3cb76b02a617253458d2cb85b68a9e09148ce899fb62663af3fefcee0127bba8
+EBUILD chromium-5.0.307.1.ebuild 4886 RMD160 d2e4f1e9561a2011fd7fc2ed596f02eacd1b8d91 SHA1 9d20db8267cf5117c3eb917bdc2f1b85d9ddc6fb SHA256 67702c4c91179944eaca3480bd072ba628358fee7d0debf3dd9468f2533d2734
+EBUILD chromium-9999.ebuild 6599 RMD160 772b892375ed50ea0f8bbeadf2c636446d71b4ed SHA1 57e8d4cab49c6efb8afa047a911edc6926ef2231 SHA256 31e8985b7a739bf2285e1c34b1c4eec2a4cc0560bc1979bc5c023f233c974ce5
+MISC ChangeLog 11095 RMD160 7488fd0202c311631952844e07f4b37fd7e739ae SHA1 c5c015ded28e0fede4f8516d8ff2327d81c5801f SHA256 34f65d77850264835e52a0d03a9180fdbf9e580c18c5c125dae9a4df1946fcea
 MISC metadata.xml 578 RMD160 a6e635fb90171f5698b32ef0ed36747f921f8aed SHA1 f72cfb81f43187583315e032db709083742aeb41 SHA256 9f3586e43f40a626d328c426b96966ac7e91d04095c71d16a1573bef60e46fa1
diff --git a/www-client/chromium/chromium-4.0.266.0-r1.ebuild b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
index 9c6b6ceaf7ee..9a31023d2c36 100644
--- a/www-client/chromium/chromium-4.0.266.0-r1.ebuild
+++ b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v 1.4 2010/01/28 10:26:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v 1.5 2010/02/03 13:11:38 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -146,9 +146,15 @@ src_install() {
 	# Plugins symlink
 	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
 
+	# Icon and desktop entry
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
 	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
 		|| die "desktop file sed failed"
+	# Gnome default application entry
+	dodir /usr/share/gnome-control-center/default-apps
+	insinto /usr/share/gnome-control-center/default-apps
+	doins "${FILESDIR}"/chromium.xml
+
 }
diff --git a/www-client/chromium/chromium-5.0.307.1.ebuild b/www-client/chromium/chromium-5.0.307.1.ebuild
new file mode 100644
index 000000000000..7ec2e72abd19
--- /dev/null
+++ b/www-client/chromium/chromium-5.0.307.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.1.ebuild,v 1.1 2010/02/03 13:11:38 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs flag-o-matic
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+ffmpeg"
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	>=gnome-base/gconf-2.24.0
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg
+	media-libs/libpng
+	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7
+	x11-libs/libXScrnSaver
+	x11-misc/xdg-utils
+	|| (
+		x11-themes/gnome-icon-theme
+		x11-themes/tango-icon-theme
+		x11-themes/xfce4-icon-theme
+	)"
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23
+	sys-devel/flex"
+
+src_prepare() {
+	# Gentoo uses .kde4, not .kde
+	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
+	# would be better
+	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
+	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+
+	# Disable prefixing to allow linking against system zlib
+	sed -e '/^#include "mozzconf.h"$/d' \
+		-i third_party/zlib/zconf.h \
+		|| die "zlib sed failed"
+}
+
+src_configure() {
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	# CFLAGS/LDFLAGS
+	mkdir -p "${S}"/.gyp
+	cat << EOF > "${S}"/.gyp/include.gypi
+{
+	'target_defaults': {
+		'cflags': [ '${CFLAGS// /','}' ],
+		'ldflags': [ '${LDFLAGS// /','}' ],
+	},
+}
+EOF
+	export HOME="${S}"
+
+	# Configuration options (system libraries)
+	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)
+
+	# Sandbox paths
+	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	if use amd64 ; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	fi
+
+	if use x86 ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	fi
+
+	if use arm; then
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		append-flags -fno-tree-sink
+	fi
+
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
+}
+
+src_compile() {
+	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		rootdir="${S}" \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		|| die "compilation failed"
+}
+
+src_install() {
+	# Chromium does not have "install" target in the build system.
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	dodir ${CHROMIUM_HOME}
+
+	exeinto ${CHROMIUM_HOME}
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox
+	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
+
+	insinto ${CHROMIUM_HOME}
+	doins out/Release/chrome.pak
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	# chrome.1 is for chromium --help
+	newman out/Release/chrome.1 chrome.1
+	newman out/Release/chrome.1 chromium.1
+
+	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
+
+	# Icon and desktop entry
+	newicon out/Release/product_logo_48.png ${PN}-browser.png
+	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
+		|| die "desktop file sed failed"
+	# Gnome default application entry
+	dodir /usr/share/gnome-control-center/default-apps
+	insinto /usr/share/gnome-control-center/default-apps
+	doins "${FILESDIR}"/chromium.xml
+
+}
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index d3cbd4adf742..5ff490a7a1a9 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.23 2010/02/01 18:47:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.24 2010/02/03 13:11:38 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion flag-o-matic
@@ -190,9 +190,15 @@ src_install() {
 	# Plugins symlink
 	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
 
+	# Icon and desktop entry
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
 	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
 		|| die "desktop file sed failed"
+	# Gnome default application entry
+	dodir /usr/share/gnome-control-center/default-apps
+	insinto /usr/share/gnome-control-center/default-apps
+	doins "${FILESDIR}"/chromium.xml
+
 }
diff --git a/www-client/chromium/files/chromium.xml b/www-client/chromium/files/chromium.xml
new file mode 100644
index 000000000000..efee7b8858d1
--- /dev/null
+++ b/www-client/chromium/files/chromium.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
+<default-apps>
+  <web-browsers>
+    <web-browser>
+      <name>Chromium</name>
+      <executable>chromium</executable>
+      <command>chromium %s</command>
+      <icon-name>chromium-browser</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+    </web-browser>
+  </web-browsers>
+</default-apps>
\ No newline at end of file