summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-11-13 07:12:57 +0000
committerUlrich Müller <ulm@gentoo.org>2014-11-13 07:12:57 +0000
commitc83a0b285903b114b57c5a83a176ce6ff7bce0c0 (patch)
tree7d8a362b89cdd5fdf60211d3f31a23a639c74962 /profiles
parentVersion bump. (diff)
downloadgentoo-2-c83a0b285903b114b57c5a83a176ce6ff7bce0c0.tar.gz
gentoo-2-c83a0b285903b114b57c5a83a176ce6ff7bce0c0.tar.bz2
gentoo-2-c83a0b285903b114b57c5a83a176ce6ff7bce0c0.zip
Unmask app-editors/emacs-vcs live git ebuilds.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 5 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e53a67ce77f0..3c896a789aaf 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.9538 2014/11/13 02:01:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9539 2014/11/13 07:12:57 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!
+ 13 Nov 2014; Ulrich Müller <ulm@gentoo.org> package.mask:
+ Unmask app-editors/emacs-vcs live git ebuilds.
+
13 Nov 2014; Davide Pesavento <pesa@gentoo.org> package.mask:
Mask Qt 4.8.6 multilib ebuilds.
diff --git a/profiles/package.mask b/profiles/package.mask
index c081dc1087eb..e6e6340c6a7d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16161 2014/11/13 02:01:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16162 2014/11/13 07:12:57 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
@@ -59,12 +59,6 @@
=dev-qt/qtwebkit-4.8.6*
=dev-qt/qtxmlpatterns-4.8.6*
-# Ulrich Müller <ulm@gentoo.org> (12 Nov 2014)
-# Temporary mask because of problems with upstream git repo;
-# fallback to live bzr ebuilds.
-=app-editors/emacs-vcs-24.4.9999-r2
-=app-editors/emacs-vcs-25.0.9999-r1
-
# Eray Aslan <eras@gentoo.org> (11 Nov 2014)
# Mask beta releases
=net-proxy/squid-3.5*