Beta channel bump. Use chromium eclass.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 52 insertions, 159 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 197c4708c1da..e4ee946e0d0f 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.99 2012/03/14 02:15:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.100 2012/03/15 05:07:57 floppym Exp $
+
+*google-chrome-18.0.1025.58_beta126506 (15 Mar 2012)
+
+  15 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+  +google-chrome-18.0.1025.58_beta126506.ebuild,
+  -google-chrome-18.0.1025.56_beta126037.ebuild,
+  google-chrome-19.0.1068.0_alpha126342.ebuild:
+  Beta channel bump. Use chromium eclass.
 
 *google-chrome-19.0.1068.0_alpha126342 (14 Mar 2012)
 
diff --git a/www-client/google-chrome/google-chrome-18.0.1025.56_beta126037.ebuild b/www-client/google-chrome/google-chrome-18.0.1025.58_beta126506.ebuild
index c8c41b96e7b9..e013b0ea89c8 100644
--- a/www-client/google-chrome/google-chrome-18.0.1025.56_beta126037.ebuild
+++ b/www-client/google-chrome/google-chrome-18.0.1025.58_beta126506.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.56_beta126037.ebuild,v 1.1 2012/03/12 20:01:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.58_beta126506.ebuild,v 1.1 2012/03/15 05:07:57 floppym Exp $
 
 EAPI="4"
 
-inherit eutils fdo-mime gnome2-utils multilib pax-utils
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils multilib pax-utils
 
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="http://www.google.com/chrome"
@@ -38,42 +42,37 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="+plugins"
 RESTRICT="mirror strip"
 
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
-	    IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
-	app-misc/ca-certificates
+RDEPEND="
 	media-libs/alsa-lib
-	dev-libs/atk
-	dev-libs/dbus-glib
+	app-arch/bzip2
+	x11-libs/cairo
+	net-print/cups
+	sys-apps/dbus
 	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype
+	app-misc/ca-certificates
+	gnome-base/gconf:2
+	dev-libs/libgcrypt
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
 	dev-libs/glib:2
-	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
-	gnome-base/gconf:2
-	dev-libs/libgcrypt
-	media-libs/fontconfig
-	media-libs/freetype
-	net-print/cups
+	x11-libs/pango
 	media-libs/libpng:1.2
-	sys-apps/dbus
 	|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
+	sys-fs/udev
 	x11-libs/libX11
-	x11-libs/libXrender
 	x11-libs/libXext
-	x11-libs/pango
-	x11-misc/xdg-utils"
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	sys-libs/zlib
+	x11-misc/xdg-utils
+	net-misc/curl
+	dev-libs/openssl:0.9.8
+"
 
 # Add blockers for the other slots.
 for x in 0 beta stable unstable; do
@@ -85,23 +84,13 @@ done
 QA_PREBUILT="*"
 S=${WORKDIR}
 
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
 chrome_unpack() {
 	local x
 	for x in "${@}"; do
 		if [[ ${x} == *.deb ]]; then
 			# Avoid automagic usage of deb2targz.
 			echo ">>> Unpacking ${x} to ${PWD}"
-			ar x "${DISTDIR}/${x}" || die
+			ar x "${DISTDIR}/${x}" data.tar.lzma || die
 		else
 			unpack "${x}"
 		fi
@@ -112,55 +101,17 @@ src_unpack() {
 	chrome_unpack ${A} ./data.tar.lzma
 }
 
-src_prepare() {
+src_install() {
 	CHROME_HOME="opt/google/chrome/"
 
 	pax-mark m ${CHROME_HOME}chrome || die
 	rm -rf usr/share/menu || die
 	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
 
-	# Support LINGUAS, bug #332751.
-	cd "${CHROME_HOME}locales" || die
-	local pak
-	for pak in *.pak; do
-		local pakbasename="$(basename ${pak})"
-		local pakname="${pakbasename%.pak}"
-		local langname="${pakname//-/_}"
-
-		# Do not issue warning for en_US locale. This is the fallback
-		# locale so it should always be installed.
-		if [[ "${langname}" == "en_US" ]]; then
-			continue
-		fi
+	pushd "${CHROME_HOME}locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd
 
-		local found=false
-		local lang
-		for lang in ${LANGS}; do
-			local crlang="$(chromium_lang ${lang})"
-			if [[ "${langname}" == "${crlang}" ]]; then
-				found=true
-				break
-			fi
-		done
-		if ! $found; then
-			ewarn "LINGUAS warning: no ${langname} in LANGS"
-		fi
-	done
-	local lang
-	for lang in ${LANGS}; do
-		local crlang="$(chromium_lang ${lang})"
-		local pakfile="${crlang//_/-}.pak"
-		if [ ! -f "${pakfile}" ]; then
-			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
-		fi
-		if ! use linguas_${lang}; then
-			rm "${pakfile}" || die
-		fi
-	done
-
-}
-
-src_install() {
 	mv opt usr "${D}" || die
 
 	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
@@ -179,17 +130,3 @@ src_install() {
 		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
 	done
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild b/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild
index 3cba75fdc2ec..2702b1089f77 100644
--- a/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild
+++ b/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild,v 1.1 2012/03/14 02:15:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild,v 1.2 2012/03/15 05:07:57 floppym Exp $
 
 EAPI="4"
 
-inherit eutils fdo-mime gnome2-utils multilib pax-utils
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils multilib pax-utils
 
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="http://www.google.com/chrome"
@@ -80,16 +84,6 @@ done
 QA_PREBUILT="*"
 S=${WORKDIR}
 
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
 chrome_unpack() {
 	local x
 	for x in "${@}"; do
@@ -107,49 +101,17 @@ src_unpack() {
 	chrome_unpack ${A} ./data.tar.lzma
 }
 
-src_prepare() {
+src_install() {
 	CHROME_HOME="opt/google/chrome/"
 
 	pax-mark m ${CHROME_HOME}chrome || die
 	rm -rf usr/share/menu || die
 	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
 
-	# Support LINGUAS, bug #332751.
-	# Emulate logic from po.m4.
-	if [[ "%UNSET%" != "${LINGUAS-%UNSET%}" ]]; then
-		local found desiredlang presentlang pak pakname
-
-		pushd "${CHROME_HOME}locales" > /dev/null || die
-
-		for pak in *.pak; do
-			pakname="${pak%.pak}"
-			pakname="${pakname/-/_}"
-			presentlang="$(chromium_lang "${pakname}")"
-
-			# Do not issue warning for en_US locale. This is the fallback
-			# locale so it should always be installed.
-			if [[ "${presentlang}" == "en_US" ]]; then
-				continue
-			fi
-
-			found=
-			for desiredlang in ${LINGUAS}; do
-				if [[ "${desiredlang}" == "${presentlang}"* ]]; then
-					found=1
-					break
-				fi
-			done
-
-			if [[ -z ${found} ]]; then
-				rm "${pak}" || die
-			fi
-		done
-
-		popd > /dev/null
-	fi
-}
+	pushd "${CHROME_HOME}locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd
 
-src_install() {
 	mv opt usr "${D}" || die
 
 	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
@@ -168,17 +130,3 @@ src_install() {
 		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
 	done
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}