Version bump for dev channel release. Contains a workaround for bug #326609 by Aaron Haviland <orion@parsed.net>. Removed old ebuild.

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

4 files changed, 61 insertions, 66 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e7defe6f7cb6..6be53fc574f4 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.129 2010/07/03 07:47:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.130 2010/07/03 09:34:47 phajdan.jr Exp $
+
+*chromium-6.0.453.1 (03 Jul 2010)
+
+  03 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-6.0.437.1.ebuild, +chromium-6.0.453.1.ebuild,
+  chromium-9999.ebuild:
+  Version bump for dev channel release. Contains a workaround for bug
+  #326609 by Aaron Haviland <orion@parsed.net>. Removed old ebuild.
 
 *chromium-5.0.375.99 (03 Jul 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cfa109f2a855..b8578248de6f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,12 +10,12 @@ AUX chromium-optional-cups-r1.patch 647 RMD160 990d9d33e43cb2429eb6019df8a2625f9
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.375.86.tar.bz2 163295338 RMD160 ccff650d9520bd6dbd7758ec65e288cc649c0cae SHA1 8e95d93903e9c7cd5321c32ed46d3137ef2d99d8 SHA256 c94034cbcc883eec229f259f3d09637317fbbbca4a3d438a339bfc42953c3ec1
 DIST chromium-5.0.375.99.tar.bz2 163269200 RMD160 0164f7b0fa099ac30279e3886d1d46ef5ed531c8 SHA1 6943978ea3262bf9ee913cbc36b03202774607ff SHA256 cfe592d252de04fd5051b6282740fe69dc7c8c86e13b419eeb1962b1a0ece82e
-DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9de4b16a5b SHA1 01440e58c29bc24f9dbf646391859475dd34b856 SHA256 82207de9036cbfe30e91f3e81c5faab35a2077b9007af89b8e87c2218d8ba269
 DIST chromium-6.0.437.3.tar.bz2 124160001 RMD160 74be10daf0727b76d9ed5e02210796998ccf0069 SHA1 1568aa0e368af02e60ad7746743b332948fbad75 SHA256 88671254bc0a911beefef866ac263a489bf91fca7ad967ad25921ef29b5b8150
+DIST chromium-6.0.453.1.tar.bz2 123140746 RMD160 97423641f926a9fb39408f54e7cd4872a52003da SHA1 4618f50f81fa99df340cdeb62006d41f0ae7fcae SHA256 3e357383752b5f3059997c24c5c4bab396c69df9e4fd657060347960277f4cc0
 EBUILD chromium-5.0.375.86.ebuild 5531 RMD160 30b33b47d27be694bfd07036a875384a2e091c4f SHA1 cd4141553b04034c9cd17a2cd65b632849afdf10 SHA256 d69079c9bdc0b98466cc2e9afcf0d862762ab81377e4f21d4c9f04d5401154de
 EBUILD chromium-5.0.375.99.ebuild 5536 RMD160 3b050becb1ed22960f004ef4f9011bdaeccb4fe6 SHA1 c0d05fe80b1d44db877f9d95875c6473e4a4e816 SHA256 39aa99ff982fa70f0fdccee92532a83c371caff4e550683679438843c4aa3ee9
-EBUILD chromium-6.0.437.1.ebuild 6375 RMD160 be6be6f40fe24ad710314b4ddd10119686e5a69a SHA1 392b75700a9d76e65b9f5f1be4605d99e69e0754 SHA256 2f9b18544c81573161d9f1385c91f1f85c6110ce83f754b294806de44d7ee474
 EBUILD chromium-6.0.437.3.ebuild 6375 RMD160 fdd78c6b6509a82d0fbfa1aa150d558cd0955007 SHA1 b9ea6ec0d556ddd5d6304b5dfb925f637243e970 SHA256 d88ac315f20b122b8280d6783ada3eb42b1ae45eb2b2e0ef75d84f2ba5b1b8b4
-EBUILD chromium-9999.ebuild 7835 RMD160 a37905477b05ac842be39bd28905d42a34b31c32 SHA1 739965bcfb5f1eadd8178e83d527cfdff19655db SHA256 10ebdfba03e49f050c805d931f8e2b89d2d5682b033dea032dd0dbe8500b8d7e
-MISC ChangeLog 28769 RMD160 8e05afb567c1cf4a5b3b4ed7804293e6e0adf241 SHA1 b5c775371f6ef420bc1cdfc85968abe18b84c997 SHA256 c038c7b8778c47a83c1758016909301b95fe425905323ad2e8abe33839a618b6
+EBUILD chromium-6.0.453.1.ebuild 6217 RMD160 4105330fe83b2bfc68174787bef5b5ec2597463e SHA1 9258aceabccaf9c405b8d476458970f7560bb0fa SHA256 d4dc0e3dcce52863ded5792ed77a31029951ccf5ce14fa8029af36d36ee1cc83
+EBUILD chromium-9999.ebuild 7861 RMD160 27976b085ed58739b55eb620c028ed4a3be0f303 SHA1 daf57d18fe6177cac5003964474146954527a516 SHA256 a29413960791c1035ac5e49fe7c8e32028721deeeb4f6be45aa150b00e6912f3
+MISC ChangeLog 29080 RMD160 7cb7ae5897f888644e7268e17ba72d7129a10987 SHA1 fcceb1abac0fb2d7a3742686985a5c28829acc4c SHA256 98476cf3ad751b93d0f0d6d1d28d3a0d1fff0a93f1b09920d35f96f0a731664d
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-6.0.437.1.ebuild b/www-client/chromium/chromium-6.0.453.1.ebuild
index c81ce9b20b67..96b9b54219c9 100644
--- a/www-client/chromium/chromium-6.0.437.1.ebuild
+++ b/www-client/chromium/chromium-6.0.453.1.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-6.0.437.1.ebuild,v 1.5 2010/06/21 09:25:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.453.1.ebuild,v 1.1 2010/07/03 09:34:47 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -17,8 +17,6 @@ IUSE="cups sse2"
 
 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
@@ -46,6 +44,10 @@ RDEPEND+="
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+get_chromium_home() {
+	echo "/usr/$(get_libdir)/chromium-browser"
+}
+
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
@@ -60,37 +62,28 @@ src_prepare() {
 	# Disable VP8 until we have a recent enough system-provided ffmpeg.
 	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
 
-	# Make dependency on cups optional, bug #324105.
-	epatch "${FILESDIR}"/${PN}-optional-cups-r1.patch
-
-	# Fix gyp files to correctly support system-provided libraries.
-	epatch "${FILESDIR}"/${PN}-gyp-fixes-r2.patch
-
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/libevent"
 	remove_bundled_lib "third_party/libjpeg"
 	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/libxml"
-	remove_bundled_lib "third_party/libxslt"
+	# TODO: also remove third_party/libxml and third_party/libxslt when
+	# http://crbug.com/29333 is fixed.
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
 	# remove it (minizip-related).
 }
 
 src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Workaround for bug #318969.
-	# TODO: remove when http://crbug.com/43778 is fixed.
-	append-flags -D__STDC_CONSTANT_MACROS
-
 	local myconf=""
 
 	# Make it possible to build chromium on non-sse2 systems.
-	if ! use sse2; then
+	if use sse2; then
+		myconf="${myconf} -Ddisable_sse2=0"
+	else
 		myconf="${myconf} -Ddisable_sse2=1"
 	fi
 
 	# Use system-provided libraries.
+	# TODO: use_system_libxml (http://crbug.com/29333).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl when we have a recent enough system NSS.
@@ -100,7 +93,6 @@ src_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
-		-Duse_system_libxml=1
 		-Duse_system_zlib=1"
 
 	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
@@ -115,8 +107,8 @@ src_configure() {
 
 	# Enable sandbox.
 	myconf="${myconf}
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome"
 
 	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
 	# and the performance gain isn't worth it.
@@ -168,20 +160,19 @@ src_compile() {
 }
 
 src_install() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
+	dodir "$(get_chromium_home)"
 
-	exeinto ${CHROMIUM_HOME}
+	exeinto "$(get_chromium_home)"
 	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
 	doexe out/Release/xdg-settings
 	doexe "${FILESDIR}"/chromium-launcher.sh
 
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
+	insinto "$(get_chromium_home)"
+	doins out/Release/chrome.pak || die "installing chrome.pak failed"
+	doins out/Release/resources.pak || die "installing resources.pak failed"
 
 	doins -r out/Release/locales
 	doins -r out/Release/resources
@@ -192,16 +183,16 @@ src_install() {
 
 	# 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}
+	dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)"
+	dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)"
+	dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)"
 
 	# Use system plugins by default.
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins"
 
 	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	dosym "$(get_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"
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 5f6978f425b1..d56bbf942165 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.63 2010/06/23 15:19:52 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.64 2010/07/03 09:34:47 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -19,8 +19,6 @@ IUSE="cups sse2"
 
 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
@@ -91,6 +89,10 @@ src_unpack() {
 	elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH}_p${CREV} "
 }
 
+get_chromium_home() {
+	echo "/usr/$(get_libdir)/chromium-browser"
+}
+
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
@@ -106,27 +108,24 @@ src_prepare() {
 	remove_bundled_lib "third_party/libevent"
 	remove_bundled_lib "third_party/libjpeg"
 	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/libxml"
-	remove_bundled_lib "third_party/libxslt"
+	# TODO: also remove third_party/libxml and third_party/libxslt when
+	# http://crbug.com/29333 is fixed.
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
 	# remove it (minizip-related).
 }
 
 src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Workaround for bug #318969.
-	# TODO: remove when http://crbug.com/43778 is fixed.
-	append-flags -D__STDC_CONSTANT_MACROS
-
 	local myconf=""
 
 	# Make it possible to build chromium on non-sse2 systems.
-	if ! use sse2; then
+	if use sse2; then
+		myconf="${myconf} -Ddisable_sse2=0"
+	else
 		myconf="${myconf} -Ddisable_sse2=1"
 	fi
 
 	# Use system-provided libraries.
+	# TODO: use_system_libxml (http://crbug.com/29333).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl when we have a recent enough system NSS.
@@ -136,7 +135,6 @@ src_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
-		-Duse_system_libxml=1
 		-Duse_system_zlib=1"
 
 	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
@@ -151,8 +149,8 @@ src_configure() {
 
 	# Enable sandbox.
 	myconf="${myconf}
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome"
 
 	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
 	# and the performance gain isn't worth it.
@@ -204,21 +202,19 @@ src_compile() {
 }
 
 src_install() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
+	dodir "$(get_chromium_home)"
 
-	exeinto ${CHROMIUM_HOME}
+	exeinto "$(get_chromium_home)"
 	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
 	doexe out/Release/xdg-settings
 	doexe "${FILESDIR}"/chromium-launcher.sh
 
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
-	doins out/Release/resources.pak
+	insinto "$(get_chromium_home)"
+	doins out/Release/chrome.pak || die "installing chrome.pak failed"
+	doins out/Release/resources.pak || die "installing resources.pak failed"
 
 	doins -r out/Release/locales
 	doins -r out/Release/resources
@@ -229,16 +225,16 @@ src_install() {
 
 	# 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}
+	dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)"
+	dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)"
+	dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)"
 
 	# Use system plugins by default.
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins"
 
 	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	dosym "$(get_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"