summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2012-05-07 01:20:53 +0000
committerNaohiro Aota <naota@gentoo.org>2012-05-07 01:20:53 +0000
commitaccccad11bc1a17414406552e44b13bf40b1f772 (patch)
tree1ec56fe5b04dddbae56f03289f9290d0d6891a46
parentremove old (diff)
downloadgentoo-2-accccad11bc1a17414406552e44b13bf40b1f772.tar.gz
gentoo-2-accccad11bc1a17414406552e44b13bf40b1f772.tar.bz2
gentoo-2-accccad11bc1a17414406552e44b13bf40b1f772.zip
Revert mis-unmasked packages.
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask10
2 files changed, 13 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 89c099942a5f..b9d37361e3d5 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6507 2012/05/07 01:06:08 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6508 2012/05/07 01:20:53 naota 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 May 2012; Naohiro Aota <naota@gentoo.org> package.mask:
+ Revert mis-unmasked packages.
+
+ 07 May 2012; Naohiro Aota <naota@gentoo.org> package.mask:
Mask upstream dead canna dictionary packages.
06 May 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 06effba08f1b..c345144341f4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13726 2012/05/07 01:06:08 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13727 2012/05/07 01:20:53 naota 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
@@ -376,7 +376,15 @@ x11-wm/scrotwm
# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (22 Jan 2012)
# Mask compiz for last-rites unless someone steps up
# to maintain it. Removal in 30 days.
+x11-libs/compiz-bcop
+x11-libs/compizconfig-backend-gconf
+x11-libs/compizconfig-backend-kconfig4
+x11-plugins/compiz-plugins-extra
+x11-plugins/compiz-plugins-main
+x11-plugins/compiz-plugins-unsupported
+x11-themes/emerald-themes
x11-wm/compiz-fusion
+x11-wm/emerald
# Michał Górny <mgorny@gentoo.org> (21 Jan 2012)
# Blocks sysvinit yet doesn't provide all tools provided by it.