diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-01-08 00:15:44 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-08 00:15:44 +0000 |
| commit | 2dd4b566e93e70621f5a2056ab2bedc880be9a4d (patch) | |
| tree | 66aa029453449737c61394d706231df2b6d3441a /profiles | |
| parent | stable x86, bug 350491 (diff) | |
| download | historical-2dd4b566e93e70621f5a2056ab2bedc880be9a4d.tar.gz historical-2dd4b566e93e70621f5a2056ab2bedc880be9a4d.tar.bz2 historical-2dd4b566e93e70621f5a2056ab2bedc880be9a4d.zip | |
Block virtual/mysql-5.2 that is used in the overlay.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index f25cbbb9115c..42431ccb95a9 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4914 2011/01/07 14:29:24 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4915 2011/01/08 00:15:44 robbat2 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! + 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> package.mask: + Block virtual/mysql-5.2 that is used in the overlay. + 07 Jan 2011; Sebastian Pipping <sping@gentoo.org> package.mask: Unmask rss2email >=2.69, transition from 2.65 to 2.69 got basic testing now diff --git a/profiles/package.mask b/profiles/package.mask index 3fed16f3c119..9e0aca5b0044 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12337 2011/01/07 14:29:24 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12338 2011/01/08 00:15:44 robbat2 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 @@ -892,10 +892,12 @@ sys-libs/ss # Robin H. Johnson <robbat2@gentoo.org> (01 Feb 2010) # Mask 5.4 series that is nearly a release candidate upstream (expected within the next 6 months) # Mask 5.5/6.0 series that are alpha and and crazy experimental. +# Mask 5.2 virtual that exists in the overlay as well (it is MariaDB only) =dev-db/mysql-5.4* =virtual/mysql-5.4* >=dev-db/mysql-5.5 >=virtual/mysql-5.5 +=virtual/mysql-5.2* # Matthias Schwarzott <zzam@gentoo.org> (22 Jan 2010) # since long time included in media-tv/gentoo-vdr-scripts |