* [gentoo-commits] gentoo-x86 commit in www-client/google-chrome: google-chrome-18.0.1025.58_beta126506.ebuild google-chrome-19.0.1068.0_alpha126342.ebuild ChangeLog google-chrome-18.0.1025.56_beta126037.ebuild
@ 2012-03-15 5:07 Mike Gilbert (floppym)
0 siblings, 0 replies; only message in thread
From: Mike Gilbert (floppym) @ 2012-03-15 5:07 UTC (permalink / raw
To: gentoo-commits
floppym 12/03/15 05:07:57
Modified: google-chrome-19.0.1068.0_alpha126342.ebuild
ChangeLog
Added: google-chrome-18.0.1025.58_beta126506.ebuild
Removed: google-chrome-18.0.1025.56_beta126037.ebuild
Log:
Beta channel bump. Use chromium eclass.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.2 www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild?r1=1.1&r2=1.2
Index: google-chrome-19.0.1068.0_alpha126342.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1068.0_alpha126342.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- google-chrome-19.0.1068.0_alpha126342.ebuild 14 Mar 2012 02:15:56 -0000 1.1
+++ google-chrome-19.0.1068.0_alpha126342.ebuild 15 Mar 2012 05:07:57 -0000 1.2
@@ -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 @@
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 @@
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 @@
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
-}
1.100 www-client/google-chrome/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?r1=1.99&r2=1.100
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog 14 Mar 2012 02:15:56 -0000 1.99
+++ ChangeLog 15 Mar 2012 05:07:57 -0000 1.100
@@ -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)
1.1 www-client/google-chrome/google-chrome-18.0.1025.58_beta126506.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.58_beta126506.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.58_beta126506.ebuild?rev=1.1&content-type=text/plain
Index: google-chrome-18.0.1025.58_beta126506.ebuild
===================================================================
# 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.58_beta126506.ebuild,v 1.1 2012/03/15 05:07:57 floppym Exp $
EAPI="4"
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"
case ${PV} in
*_alpha*)
SLOT="unstable"
MY_PV=${PV/_alpha/-r}
;;
*_beta*)
SLOT="beta"
MY_PV=${PV/_beta/-r}
;;
*_p*)
SLOT="stable"
MY_PV=${PV/_p/-r}
;;
*)
die "Invalid value for \${PV}: ${PV}"
;;
esac
MY_PN="${PN}-${SLOT}"
MY_P="${MY_PN}_${MY_PV}"
SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
LICENSE="google-chrome"
KEYWORDS="-* ~amd64 ~x86"
IUSE="+plugins"
RESTRICT="mirror strip"
RDEPEND="
media-libs/alsa-lib
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/nspr
dev-libs/nss
x11-libs/pango
media-libs/libpng:1.2
|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
sys-fs/udev
x11-libs/libX11
x11-libs/libXext
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
if [[ ${SLOT} != ${x} ]]; then
RDEPEND+=" !${CATEGORY}/${PN}:${x}"
fi
done
QA_PREBUILT="*"
S=${WORKDIR}
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}" data.tar.lzma || die
else
unpack "${x}"
fi
done
}
src_unpack() {
chrome_unpack ${A} ./data.tar.lzma
}
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
pushd "${CHROME_HOME}locales" > /dev/null || die
chromium_remove_language_paks
popd
mv opt usr "${D}" || die
fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
if use plugins ; then
local args='"$@"'
local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
-i "${D}${CHROME_HOME}google-chrome" || die
fi
domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
local size
for size in 16 22 24 32 48 64 128 256 ; do
insinto /usr/share/icons/hicolor/${size}x${size}/apps
newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
done
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-15 5:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15 5:07 [gentoo-commits] gentoo-x86 commit in www-client/google-chrome: google-chrome-18.0.1025.58_beta126506.ebuild google-chrome-19.0.1068.0_alpha126342.ebuild ChangeLog google-chrome-18.0.1025.56_beta126037.ebuild Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox