diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-06-18 17:52:47 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-06-18 17:52:47 +0000 |
| commit | b9fe54885a4be8fad18a5b1530ba821befb85e44 (patch) | |
| tree | c5a717f6ebe730906c1f53c088fd67e433667e19 | |
| parent | Fix underlink. Bug #369311 (diff) | |
| download | gentoo-2-b9fe54885a4be8fad18a5b1530ba821befb85e44.tar.gz gentoo-2-b9fe54885a4be8fad18a5b1530ba821befb85e44.tar.bz2 gentoo-2-b9fe54885a4be8fad18a5b1530ba821befb85e44.zip | |
Update Robin's earlier mask of mysql-5.2 to add mask for mariadb-5.2*.
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/package.mask | 25 |
2 files changed, 19 insertions, 12 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 450775f4b17f..492dc7ee55c5 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5459 2011/06/18 13:12:02 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5460 2011/06/18 17:52:47 jmbsvicetto 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! + 18 Jun 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + package.mask: + Update Robin's earlier mask of mysql-5.2 to add mask for mariadb-5.2*. + 18 Jun 2011; Eray Aslan <eras@gentoo.org> package.mask: Mask mail-client/smtpclient for removal diff --git a/profiles/package.mask b/profiles/package.mask index b51bfb555fc3..311af73b16a6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12851 2011/06/18 13:12:02 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12852 2011/06/18 17:52:47 jmbsvicetto 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,6 +31,19 @@ #--- END OF EXAMPLES --- +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (18 Jun 2011) +# Add mariadb mask to Robin's earlier mask +# 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 +=dev-db/mariadb-5.2* +=virtual/mysql-5.2* + # Eray Aslan <eras@gentoo.org> (18 Jun 2011) # Dead upstream. Lots of alternatives including mailx, # nail, ssmtp, postfix... @@ -779,16 +792,6 @@ net-fs/samba-client # Masking libmapi as it depends on masked samba4 =net-libs/libmapi-0.9 -# 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 media-tv/vdr-dvd-scripts |