summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-10-09 23:12:09 +0000
committerMike Gilbert <floppym@gentoo.org>2013-10-09 23:12:09 +0000
commit4ada5b4edbfa3c2e6787b4f65897e4295edde98f (patch)
treea187f22630fd7ba5e4326a83ad00662b19021894 /www-client
parentmigrate to git-r3 (diff)
downloadgentoo-2-4ada5b4edbfa3c2e6787b4f65897e4295edde98f.tar.gz
gentoo-2-4ada5b4edbfa3c2e6787b4f65897e4295edde98f.tar.bz2
gentoo-2-4ada5b4edbfa3c2e6787b4f65897e4295edde98f.zip
Bump.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/google-chrome/ChangeLog12
-rw-r--r--www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild (renamed from www-client/google-chrome/google-chrome-31.0.1650.12_beta1.ebuild)2
-rw-r--r--www-client/google-chrome/google-chrome-32.0.1664.3_alpha1.ebuild (renamed from www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild)17
3 files changed, 24 insertions, 7 deletions
diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 558f2847a0ad..694084ea09b2 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for www-client/google-chrome
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.328 2013/10/05 14:47:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.329 2013/10/09 23:12:09 floppym Exp $
+
+*google-chrome-32.0.1664.3_alpha1 (09 Oct 2013)
+*google-chrome-31.0.1650.16_beta1 (09 Oct 2013)
+
+ 09 Oct 2013; Mike Gilbert <floppym@gentoo.org>
+ +google-chrome-31.0.1650.16_beta1.ebuild,
+ +google-chrome-32.0.1664.3_alpha1.ebuild,
+ -google-chrome-31.0.1650.12_beta1.ebuild,
+ -google-chrome-31.0.1650.8_alpha1.ebuild:
+ Bump.
*google-chrome-31.0.1650.12_beta1 (05 Oct 2013)
diff --git a/www-client/google-chrome/google-chrome-31.0.1650.12_beta1.ebuild b/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild
index 6c30f6cc7706..264099bb2c8e 100644
--- a/www-client/google-chrome/google-chrome-31.0.1650.12_beta1.ebuild
+++ b/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.12_beta1.ebuild,v 1.1 2013/10/05 14:47:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild,v 1.1 2013/10/09 23:12:09 floppym Exp $
EAPI="4"
diff --git a/www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild b/www-client/google-chrome/google-chrome-32.0.1664.3_alpha1.ebuild
index ea7f206f0fd4..20a3808939c1 100644
--- a/www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild
+++ b/www-client/google-chrome/google-chrome-32.0.1664.3_alpha1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild,v 1.1 2013/10/04 03:14:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-32.0.1664.3_alpha1.ebuild,v 1.1 2013/10/09 23:12:09 floppym Exp $
EAPI="4"
@@ -81,6 +81,13 @@ RDEPEND="
x11-misc/xdg-utils
"
+# Add blockers for the other slots.
+for x in 0 beta stable; do
+ if [[ ${SLOT} != ${x} ]]; then
+ RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+ fi
+done
+
QA_PREBUILT="*"
S=${WORKDIR}
@@ -93,7 +100,7 @@ pkg_setup() {
}
src_install() {
- CHROME_HOME="opt/google/chrome-${SLOT}"
+ CHROME_HOME="opt/google/chrome"
mv opt usr "${D}" || die
cd "${D}" || die
@@ -111,13 +118,13 @@ src_install() {
if use plugins ; then
local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
- -i "${CHROME_HOME}/${MY_PN}" || die
+ -i "${CHROME_HOME}/${PN}" || die
fi
- domenu "${CHROME_HOME}/${MY_PN}.desktop" || die
+ domenu "${CHROME_HOME}/${PN}.desktop" || die
local size
for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${MY_PN}.png
+ newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
done
}