Version bump for 4.0.295.0 dev channel release.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 158 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 281196f1ddc8..a3880df0ac54 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2010/01/13 12:15:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.38 2010/01/15 11:06:55 phajdan.jr Exp $
+
+*chromium-4.0.295.0 (15 Jan 2010)
+
+  15 Jan 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-4.0.295.0.ebuild:
+  Version bump for 4.0.295.0 dev channel release.
 
   13 Jan 2010; Bernard Cafarelli <voyageur@gentoo.org>
   chromium-4.0.249.43.ebuild, chromium-4.0.260.0.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b5b95b5e7bbb..2c15f9e47acf 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,10 +6,12 @@ DIST chromium-4.0.249.43.tar.bz2 140438366 RMD160 3a95c9ed343008245000fb5e691091
 DIST chromium-4.0.260.0.tar.bz2 134032408 RMD160 6b390458306572f473b4858c8a06fb9cf8f724e0 SHA1 896ffbc613b8d75aeee3de0b3839aee086755556 SHA256 d09986e89b431476005333d00a1bfb8b59f5c7edcaf3781e6a8251468786c7cc
 DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63ed82251994 SHA1 65a8e7496f26b6c1bf663199d77fe238418f8250 SHA256 df0bce0541041c6d22ff177b4ea9cfbeee0c18d0805f1d371e6442688f42577f
 DIST chromium-4.0.288.1.tar.bz2 149595763 RMD160 7c2d9c87786da414038442518f6bff97f8ab1c99 SHA1 5d52c7ebafe5d87a7eae7844f5517c7a1e334c75 SHA256 bf74d9feaf54ea16c7dbf19c73928e6bf9da60257631d56a93ee39cb3a4e9551
+DIST chromium-4.0.295.0.tar.bz2 152197504 RMD160 6465221e9e34c700efabbccaa5757bacf2295a9e SHA1 457c79a72b90a1fe0037db6503b66a55c5c2a4e5 SHA256 d78a7cb0cdf6914fd9f87786a9fa792944a2446ce8b5a6124bedcddd2d3a4cb9
 EBUILD chromium-4.0.249.43.ebuild 4329 RMD160 c376ce69855d3b3b34df647689c72a2161170ecb SHA1 3aa0961adabedb34855736d0bda03b70b2258fbf SHA256 230bac6158556b40f8b0cf4e7ae50ae0180c581c171807c71fd27cb69b8871de
 EBUILD chromium-4.0.260.0.ebuild 4313 RMD160 b45d7b31a069df89c7bc9d5d89888af61058712d SHA1 02046c43a7fad0ca11c165f0ba2d00d2012b6233 SHA256 d240bf5a799e91f1460e6d19c332708d5e9f6034a9046db075502a1e7cd5607e
 EBUILD chromium-4.0.266.0.ebuild 4592 RMD160 bdfc2e8d22607e6eac05c5557efd29dc773c9767 SHA1 c896e17d293471613c43c007a7a618f4cca5f10a SHA256 cd2b8bedc4a984d32257b52bc54d2df531dd082b3680c130a96eb4c3c5f7750f
 EBUILD chromium-4.0.288.1.ebuild 4592 RMD160 0ef35b55fa99a1d8a5964d9d3f6d957e0fbd1be4 SHA1 4ca1dd82cd808e5bca570ff86bc62da2091a2196 SHA256 88f99b9bf1616d9c0cee785578e9582d21d833c2f8e3698d574d44d9893438a6
+EBUILD chromium-4.0.295.0.ebuild 4484 RMD160 5c1a031d3779673ea6508f10e012bf2d8372d023 SHA1 8e4d01a1334b93b3d599f94227b91dd415404588 SHA256 565068aea6d5acd7d4fab22b657d0fe74f92e8e46c5724e4b146973f53b1f118
 EBUILD chromium-9999.ebuild 6276 RMD160 5236a45920a21fe02bc89bb39808cf74a5acaa5b SHA1 f84c642072b3f2349b36afcc2951a7d08d39781e SHA256 6aa55e984cf0d7e33b7ee515bb745091007a3537fe18ecff9e8b080c18f0bb98
-MISC ChangeLog 8392 RMD160 f704ab0c7b289a498e49e9de043564beab41329a SHA1 47369fdbd8af4809955c8c819c290d7c1eacf704 SHA256 d91471f0cb2a44c00fd32ba499e4e3c4f8cae7cddef90d728a9dd02f2bf391c4
+MISC ChangeLog 8565 RMD160 d9accaa58275c8188576c55f4503d9a2be2da0c0 SHA1 0df94b570416458b33cec825706001ffff6816cf SHA256 07e3d01e8db72403f748135effe00aac5f9c09457ee7d3ffd82a8cb3e61fd2ed
 MISC metadata.xml 578 RMD160 a6e635fb90171f5698b32ef0ed36747f921f8aed SHA1 f72cfb81f43187583315e032db709083742aeb41 SHA256 9f3586e43f40a626d328c426b96966ac7e91d04095c71d16a1573bef60e46fa1
diff --git a/www-client/chromium/chromium-4.0.295.0.ebuild b/www-client/chromium/chromium-4.0.295.0.ebuild
new file mode 100644
index 000000000000..6d11f18da9dd
--- /dev/null
+++ b/www-client/chromium/chromium-4.0.295.0.ebuild
@@ -0,0 +1,148 @@
+# 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.295.0.ebuild,v 1.1 2010/01/15 11:06:55 phajdan.jr Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+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 ~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-fonts/corefonts
+	>=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-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"
+
+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
+
+	# 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"
+}
+
+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 [[ "$ABI" == "amd64" ]] ; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	fi
+
+	if [[ "$ABI" == "x86" ]] ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	fi
+
+	if use arm; then
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dv8_use_snapshot=false -Dlinux_use_tcmalloc=0"
+	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
+
+	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"
+}