summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-11-15 13:05:29 +0000
committerUlrich Müller <ulm@gentoo.org>2013-11-15 13:05:29 +0000
commit38fde50c67045c5d6f0841e148878d89ded47216 (patch)
tree28066fc8a7d7084411dbd73e0216990a80e7e9bd /profiles
parentCreate site-lisp dir if it doesn't exist yet. (diff)
downloadgentoo-2-38fde50c67045c5d6f0841e148878d89ded47216.tar.gz
gentoo-2-38fde50c67045c5d6f0841e148878d89ded47216.tar.bz2
gentoo-2-38fde50c67045c5d6f0841e148878d89ded47216.zip
Unmask emacs-common-gentoo again, problem should be fixed now.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 69f18bbc428d..2fc6ac99382c 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8360 2013/11/15 10:11:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8361 2013/11/15 13:05:29 ulm 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!
+ 15 Nov 2013; Ulrich Müller <ulm@gentoo.org> package.mask:
+ Unmask emacs-common-gentoo again, problem should be fixed now.
+
15 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> package.mask:
Mask =app-emacs/emacs-common-gentoo-1.3-r4 by ulm's request
diff --git a/profiles/package.mask b/profiles/package.mask
index a506fd2cad74..9690c9cfff69 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15209 2013/11/15 10:11:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15210 2013/11/15 13:05:29 ulm 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,11 +31,6 @@
#--- END OF EXAMPLES ---
-# Sergey Popov <pinkbyte@gentoo.org> (15 Nov 2013)
-# Masked by ulm's request
-# This version failed at pkg_preinst
-=app-emacs/emacs-common-gentoo-1.3-r4
-
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (14 Nov 2013)
# Masked for breakage on 32 bit x86, bug #491110
=x11-libs/pixman-0.32.2