summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-09-21 21:52:15 +0000
committerMike Gilbert <floppym@gentoo.org>2013-09-21 21:52:15 +0000
commit632ec96a7bf1fdb7e045dde16e7594b9615e34fa (patch)
tree7b1abbc5668d793ebb26b10c06dc656569fbf9ab /www-client
parentNeed to call mount-boot_mount_boot_partition first. (diff)
downloadgentoo-2-632ec96a7bf1fdb7e045dde16e7594b9615e34fa.tar.gz
gentoo-2-632ec96a7bf1fdb7e045dde16e7594b9615e34fa.tar.bz2
gentoo-2-632ec96a7bf1fdb7e045dde16e7594b9615e34fa.zip
Adjust blockers for side-by-side installation in M31.
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/google-chrome/ChangeLog8
-rw-r--r--www-client/google-chrome/google-chrome-29.0.1547.76_p223446.ebuild4
-rw-r--r--www-client/google-chrome/google-chrome-30.0.1599.47_beta1.ebuild4
-rw-r--r--www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild9
4 files changed, 12 insertions, 13 deletions
diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 4446c0f05699..67e560bc0475 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,12 @@
# 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.320 2013/09/21 20:58:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.321 2013/09/21 21:52:15 floppym Exp $
+
+ 21 Sep 2013; Mike Gilbert <floppym@gentoo.org>
+ google-chrome-29.0.1547.76_p223446.ebuild,
+ google-chrome-30.0.1599.47_beta1.ebuild,
+ google-chrome-31.0.1636.0_alpha1.ebuild:
+ Adjust blockers for side-by-side installation in M31.
21 Sep 2013; Mike Gilbert <floppym@gentoo.org>
google-chrome-31.0.1636.0_alpha1.ebuild:
diff --git a/www-client/google-chrome/google-chrome-29.0.1547.76_p223446.ebuild b/www-client/google-chrome/google-chrome-29.0.1547.76_p223446.ebuild
index 193a36f06e5a..d7d904e0f2f7 100644
--- a/www-client/google-chrome/google-chrome-29.0.1547.76_p223446.ebuild
+++ b/www-client/google-chrome/google-chrome-29.0.1547.76_p223446.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-29.0.1547.76_p223446.ebuild,v 1.1 2013/09/18 23:07:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-29.0.1547.76_p223446.ebuild,v 1.2 2013/09/21 21:52:15 floppym Exp $
EAPI="4"
@@ -79,7 +79,7 @@ RDEPEND="
"
# Add blockers for the other slots.
-for x in 0 beta stable unstable; do
+for x in 0 beta stable; do
if [[ ${SLOT} != ${x} ]]; then
RDEPEND+=" !${CATEGORY}/${PN}:${x}"
fi
diff --git a/www-client/google-chrome/google-chrome-30.0.1599.47_beta1.ebuild b/www-client/google-chrome/google-chrome-30.0.1599.47_beta1.ebuild
index 68327e6c3548..9e6792481a31 100644
--- a/www-client/google-chrome/google-chrome-30.0.1599.47_beta1.ebuild
+++ b/www-client/google-chrome/google-chrome-30.0.1599.47_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-30.0.1599.47_beta1.ebuild,v 1.1 2013/09/18 23:07:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-30.0.1599.47_beta1.ebuild,v 1.2 2013/09/21 21:52:15 floppym Exp $
EAPI="4"
@@ -79,7 +79,7 @@ RDEPEND="
"
# Add blockers for the other slots.
-for x in 0 beta stable unstable; do
+for x in 0 beta stable; do
if [[ ${SLOT} != ${x} ]]; then
RDEPEND+=" !${CATEGORY}/${PN}:${x}"
fi
diff --git a/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild b/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild
index dd306a29f249..5cda2b5eb8db 100644
--- a/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild
+++ b/www-client/google-chrome/google-chrome-31.0.1636.0_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.1636.0_alpha1.ebuild,v 1.2 2013/09/21 20:58:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild,v 1.3 2013/09/21 21:52:15 floppym Exp $
EAPI="4"
@@ -78,13 +78,6 @@ RDEPEND="
x11-misc/xdg-utils
"
-# 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}