Version bump for beta channel release. Remove old.

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 18 insertions, 120 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index eff36d789d6f..844c8b47c813 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.100 2010/05/21 09:10:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.101 2010/05/22 18:42:11 phajdan.jr Exp $
+
+*chromium-5.0.375.53 (22 May 2010)
+
+  22 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -files/chromium-drop_sse2.patch, -chromium-5.0.375.29.ebuild,
+  +chromium-5.0.375.53.ebuild,
+  -files/chromium-supported-media-mime-types.patch:
+  Version bump for beta channel release. Remove old.
 
 *chromium-6.0.408.1 (21 May 2010)
 
diff --git a/www-client/chromium/chromium-5.0.375.29.ebuild b/www-client/chromium/chromium-5.0.375.53.ebuild
index e537341fb037..cb1a2e7a1ba9 100644
--- a/www-client/chromium/chromium-5.0.375.29.ebuild
+++ b/www-client/chromium/chromium-5.0.375.53.ebuild
@@ -1,9 +1,10 @@
 # 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.375.29.ebuild,v 1.1 2010/05/04 14:51:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.53.ebuild,v 1.1 2010/05/22 18:42:11 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
+
+inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -12,7 +13,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="mp3 +plugins-symlink x264"
+IUSE="+plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -23,7 +24,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=]
+	>=media-video/ffmpeg-0.5_p21602[threads]
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
@@ -40,6 +41,7 @@ RDEPEND+="
 		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
+	x11-apps/xmessage
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -50,35 +52,12 @@ RDEPEND+="
 		!www-plugins/gecko-mediaplayer[gnome]
 	)"
 
-pkg_setup() {
-	if [[ "${ROOT}" == "/" ]]; then
-		# Prevent user problems like bug 299777.
-		if ! grep -q /dev/shm <<< $(get_mounts); then
-			eerror "You don't have tmpfs mounted at /dev/shm."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-			eerror "run 'mount /dev/shm' and try again."
-			die "/dev/shm is not mounted"
-		fi
-		if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-			eerror "/dev/shm does not have correct permissions."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please run chmod 1777 /dev/shm and try again."
-			die "/dev/shm has incorrect permissions"
-		fi
-	fi
-
-	elog "${PN} might crash occasionally. To get more useful backtraces"
-	elog "and submit better bug reports, please read"
-	elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-}
-
 src_prepare() {
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
 
-	# Allow supporting more media types provided system ffmpeg supports them.
-	epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
+	# Allow supporting more media types.
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 
 	# Fix build failure with libpng-1.4, bug 310959.
 	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
@@ -90,14 +69,6 @@ src_configure() {
 	# Fails to build on arm if we don't do this
 	use arm && append-flags -fno-tree-sink
 
-	if use mp3 ; then
-		append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED
-	fi
-
-	if use x264 ; then
-		append-cflags -DGENTOO_CHROMIUM_H264_ENABLED
-	fi
-
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
 	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
@@ -165,6 +136,7 @@ src_install() {
 	dodir ${CHROMIUM_HOME}
 
 	exeinto ${CHROMIUM_HOME}
+	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
 	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
diff --git a/www-client/chromium/files/chromium-drop_sse2.patch b/www-client/chromium/files/chromium-drop_sse2.patch
deleted file mode 100644
index bece9acb837a..000000000000
--- a/www-client/chromium/files/chromium-drop_sse2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
----
- build/common.gypi |   19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-Index: src/build/common.gypi
-===================================================================
---- src.orig/build/common.gypi
-+++ src/build/common.gypi
-@@ -386,25 +386,26 @@
-             #
-             # -mfpmath=sse -msse2 makes the compiler use SSE instructions
-             # which keep floating-point values in SSE registers in its
-             # native precision (32-bit for single precision, and 64-bit for
-             # double precision values). This means the floating-point value
-             # used during computation does not change depending on how the
-             # compiler optimized the code, since the value is always kept
-             # in its specified precision.
--            'conditions': [
--              ['branding=="Chromium"', {
--                'cflags': [
--                  '-march=pentium4',
--                  '-msse2',
--                  '-mfpmath=sse',
--                ],
--              }],
--            ],
-+            # Disabled: see http://code.google.com/p/chromium/issues/detail?id=9007
-+            # 'conditions': [
-+            #   ['branding=="Chromium"', {
-+            #     'cflags': [
-+            #       '-march=pentium4',
-+            #       '-msse2',
-+            #       '-mfpmath=sse',
-+            #     ],
-+            #   }],
-+            # ],
-             'cflags': [
-               '-m32',
-             ],
-             'ldflags': [
-               '-m32',
-             ],
-           }],
-         ],
diff --git a/www-client/chromium/files/chromium-supported-media-mime-types.patch b/www-client/chromium/files/chromium-supported-media-mime-types.patch
deleted file mode 100644
index 793de3d29847..000000000000
--- a/www-client/chromium/files/chromium-supported-media-mime-types.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/net/base/mime_util.cc.orig	2010-04-14 17:22:50.000000000 +0200
-+++ src/net/base/mime_util.cc	2010-04-14 17:25:13.000000000 +0200
-@@ -189,18 +189,20 @@
-   "audio/ogg",
-   "application/ogg",
- 
--#if defined(GOOGLE_CHROME_BUILD)
-+#if defined(GENTOO_CHROMIUM_H264_ENABLED)
-   // MPEG-4.
-   "video/mp4",
-   "video/x-m4v",
-   "audio/mp4",
-   "audio/x-m4a",
-+#endif  // defined(GENTOO_CHROMIUM_H264_ENABLED)
- 
-+#if defined(GENTOO_CHROMIUM_MP3_ENABLED)
-   // MP3.
-   "audio/mp3",
-   "audio/x-mp3",
-   "audio/mpeg",
--#endif
-+#endif  // defined(GENTOO_CHROMIUM_MP3_ENABLED)
- };
- 
- // List of supported codecs when passed in with <source type="...">.
-@@ -208,10 +210,10 @@
- // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
- // for more information.
- static const char* const supported_media_codecs[] = {
--#if defined(GOOGLE_CHROME_BUILD)
-+#if defined(GENTOO_CHROMIUM_H264_ENABLED)
-   "avc1",
-   "mp4a",
--#endif
-+#endif  // defined(GENTOO_CHROMIUM_H264_ENABLED)
-   "theora",
-   "vorbis",
- };