summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-05-28 02:20:44 +0000
committerMike Gilbert <floppym@gentoo.org>2014-05-28 02:20:44 +0000
commite958a7cf59f24e1b65c4d1f764cdb1c6bfe00abe (patch)
tree872720e1ec24771b921d62aeff827ddb0e4a9397 /www-client
parentDrop pdf plugin; it is now part of chromium. (diff)
downloadgentoo-2-e958a7cf59f24e1b65c4d1f764cdb1c6bfe00abe.tar.gz
gentoo-2-e958a7cf59f24e1b65c4d1f764cdb1c6bfe00abe.tar.bz2
gentoo-2-e958a7cf59f24e1b65c4d1f764cdb1c6bfe00abe.zip
Add blocker to on <chrome-binary-plugins-37 so that portage upgrades correctly.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-37.0.2008.2.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9683be3fe755..999d90d84f4a 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1083 2014/05/24 08:47:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1084 2014/05/28 02:20:44 floppym Exp $
+
+ 28 May 2014; Mike Gilbert <floppym@gentoo.org> chromium-37.0.2008.2.ebuild:
+ Add blocker to on <chrome-binary-plugins-37 so that portage upgrades
+ correctly.
*chromium-37.0.2008.2 (24 May 2014)
diff --git a/www-client/chromium/chromium-37.0.2008.2.ebuild b/www-client/chromium/chromium-37.0.2008.2.ebuild
index 4beb0c44e312..a06a5f2d4fac 100644
--- a/www-client/chromium/chromium-37.0.2008.2.ebuild
+++ b/www-client/chromium/chromium-37.0.2008.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2008.2.ebuild,v 1.1 2014/05/24 08:47:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2008.2.ebuild,v 1.2 2014/05/28 02:20:44 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -88,6 +88,7 @@ DEPEND="${RDEPEND}
# For nvidia-drivers blocker, see bug #413637 .
RDEPEND+="
!=www-client/chromium-9999
+ !<www-plugins/chrome-binary-plugins-37
x11-misc/xdg-utils
virtual/ttf-fonts
tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"