summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-11 07:56:08 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-11 07:56:08 +0000
commit25817486513e427055f5b44415ada3b888fedc00 (patch)
tree9ab53ec97043c9b6af4c5bf6b152bd6c1f854e4a /profiles
parentamd64 stable wrt bug #511730 (diff)
downloadgentoo-2-25817486513e427055f5b44415ada3b888fedc00.tar.gz
gentoo-2-25817486513e427055f5b44415ada3b888fedc00.tar.bz2
gentoo-2-25817486513e427055f5b44415ada3b888fedc00.zip
Mask multilib samba3.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0632cb208b8e..47a56a335f6c 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9064 2014/06/10 21:56:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9065 2014/06/11 07:56:08 mgorny 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!
+ 11 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask multilib samba3.
+
10 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Fix gst-plugins-gl mask.
diff --git a/profiles/package.mask b/profiles/package.mask
index 9b96ddb641d0..3d8f4c715554 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15778 2014/06/10 21:56:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15779 2014/06/11 07:56:08 mgorny 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
@@ -246,6 +246,7 @@ dev-java/ibm-jdk-bin:1.5
>=media-plugins/gst-plugins-xvid-0.10.23-r1:0.10
>=media-plugins/gst-plugins-xvideo-0.10.36-r1:0.10
>=app-emulation/emul-linux-x86-gstplugins-20140508-r1
+=net-fs/samba-3.6.23-r1
# Vladimir Smirnov <civil@gentoo.org> (27 May 2014)
# Masked for testing, will defenitely cause major breakage