summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask7
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3175037d1392..7612aa5fc3e0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +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.4619 2010/10/02 23:52:29 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4620 2010/10/03 19:42:35 dilfridge 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!
+ 03 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+ Masked =dev-tex/latex-beamer-3.10 temporarily until overlap with
+ dev-tex/translator is sorted out
+
02 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
package.mask:
Mask dev-python/IcePy.
diff --git a/profiles/package.mask b/profiles/package.mask
index 44c0eeb729c3..6eeb9c5dc9a7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12011 2010/10/02 23:52:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12012 2010/10/03 19:42:35 dilfridge 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,11 @@
#--- END OF EXAMPLES ---
+# Andreas K. Huettel <dilfridge@gentoo.org> (03 Oct 2010)
+# Masked temporarily until overlap with dev-tex/translator is
+# sorted out
+=dev-tex/latex-beamer-3.10
+
# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (02 Oct 2010)
# Included in >=dev-libs/Ice-3.3. Masked for deletion in 30 days.
dev-python/IcePy