diff options
author | Mike Gilbert <floppym@gentoo.org> | 2013-01-14 20:56:25 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2013-01-14 20:56:25 +0000 |
commit | 7edf8c388ab6c1d8b305596352bc15b1562d99d2 (patch) | |
tree | f1acaca2ec5add58e8374b2ea575003cc70c77ec | |
parent | Stable for amd64, wrt bug #451930 (diff) | |
download | historical-7edf8c388ab6c1d8b305596352bc15b1562d99d2.tar.gz historical-7edf8c388ab6c1d8b305596352bc15b1562d99d2.tar.bz2 historical-7edf8c388ab6c1d8b305596352bc15b1562d99d2.zip |
Revert last change due to bad dependencies.
-rw-r--r-- | profiles/ChangeLog | 5 | ||||
-rw-r--r-- | profiles/package.mask | 22 |
2 files changed, 15 insertions, 12 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 3ac7e621dc84..534c51d58de2 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,12 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7357 2013/01/14 20:52:05 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7358 2013/01/14 20:56:25 floppym Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! 14 Jan 2013; Mike Gilbert <floppym@gentoo.org> package.mask: + Revert last change due to bad dependencies. + + 14 Jan 2013; Mike Gilbert <floppym@gentoo.org> package.mask: Update chromium masks for chromium-25 beta release. 13 Jan 2013; Ulrich Müller <ulm@gentoo.org> license_groups: diff --git a/profiles/package.mask b/profiles/package.mask index adfd9423c2bc..739f47e524c1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14372 2013/01/14 20:52:05 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14373 2013/01/14 20:56:25 floppym Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -31,16 +31,6 @@ #--- END OF EXAMPLES --- -# Mike Gilbert <floppym@gentoo.org> (14 Jan 2013) -# Dev channel releases are only for people who are developers or want more -# experimental features and accept a more unstable release. ->=www-client/chromium-26 ->=www-client/google-chrome-26 - -# Mike Gilbert <floppym@gentoo.org> (14 Jan 2013) -# Mask v8 versions used for www-client/chromium dev channel releases. ->=dev-lang/v8-3.16 - # Tim Harder <radhermit@gentoo.org> (13 Jan 2013) # Masked for testing =mail-client/roundcube-0.9* @@ -352,6 +342,16 @@ dev-vcs/gitosis-gentoo # Masked for testing, bug #438756. >=net-libs/libsrtp-1.4.4_p20121108 +# Pawel Hajdan jr <phajdan.jr@gentoo.org> (08 Nov 2012) +# Dev channel releases are only for people who are developers or want more +# experimental features and accept a more unstable release. +>=www-client/chromium-25 +>=www-client/google-chrome-25 + +# Pawel Hajdan jr <phajdan.jr@gentoo.org> (08 Nov 2012) +# Mask v8 versions used for www-client/chromium dev channel releases. +>=dev-lang/v8-3.15 + # Joerg Bornkessel <hd_brummy@gentoo.org> (04 Nov 2012) # masked for testing, bug #422605 =media-plugins/vdr-softdevice-0.5.0.20110417 |