summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a3157a16562e..9843f30bd75a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4091 2010/04/07 15:59:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4092 2010/04/07 16:02:00 patrick 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!
07 Apr 2010; Patrick Lauer <patrick@gentoo.org> package.mask:
+ Fixing samba mask for samba4
+
+ 07 Apr 2010; Patrick Lauer <patrick@gentoo.org> package.mask:
Fixing samba masks for 3.5 and unsplit ebuilds
07 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index d06aa6b08364..e40fa9045fb5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11429 2010/04/07 15:59:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11430 2010/04/07 16:02:00 patrick 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
@@ -32,11 +32,11 @@
#--- END OF EXAMPLES ---
# Patrick Lauer <patrick@gentoo.org> (07 Apr 2010)
-# Migrating back to unsplit samba ebuilds.
+# Migrating back to unsplit samba ebuilds. Keeping samba-4 masked until release.
net-fs/samba-libs
net-fs/samba-server
net-fs/samba-client
-
+>net-fs/samba-4
# Samuli Suominen <ssuominen@gentoo.org> (07 Apr 2010)
# Missing required lvm2 wrt bug #309757. Unmask soon as it's in tree.