summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-02-01 17:48:16 +0000
committerUlrich Müller <ulm@gentoo.org>2008-02-01 17:48:16 +0000
commitbaec3e3b7a0213ee4cfe24258c1fc632d0ef7896 (patch)
treeb05e416357dc8780b51bdebd1ad8d64f90c906f2 /profiles
parentPPC Stablization of gnome-2.20-3 for bug 208366 (diff)
downloadgentoo-2-baec3e3b7a0213ee4cfe24258c1fc632d0ef7896.tar.gz
gentoo-2-baec3e3b7a0213ee4cfe24258c1fc632d0ef7896.tar.bz2
gentoo-2-baec3e3b7a0213ee4cfe24258c1fc632d0ef7896.zip
Mask emacs-cvs-22.1.9999 live ebuild, so users get the real pretest version.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask11
2 files changed, 10 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index cdbc276a1756..e8dc4fae9b83 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,10 +1,11 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1057 2008/02/01 16:39:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1058 2008/02/01 17:48:16 ulm Exp $
01 Feb 2008; Ulrich Mueller <ulm@gentoo.org> updates/3Q-2007,
- updates/1Q-2008:
+ updates/1Q-2008, package.mask:
Slotmove for app-editors/emacs-cvs after merge of unicode-2 branch.
+ Mask emacs-cvs-22.1.9999 live ebuild, so users get the real pretest version.
01 Feb 2008; Rémi Cardona <remi@gentoo.org> package.mask:
removing p.mask on latest xf86-video-i810 snapshots
diff --git a/profiles/package.mask b/profiles/package.mask
index a0760b33ed6b..99278e0219b0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8198 2008/02/01 09:54:36 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8199 2008/02/01 17:48:16 ulm Exp $
# When you add an entry to this file, add your name, the date, and an
# explanation of why something is getting masked
#
@@ -21,6 +21,12 @@
## End example
##
+# Ulrich Mueller <ulm@gentoo.org> (01 Feb 2008)
+# Live CVS ebuild of Emacs 22 base branch
+~app-editors/emacs-cvs-22.1.9999
+# Emacs 23 virtual, unmask after Emacs 23 release
+>=virtual/emacs-23
+
# Jim Ramsay <lack@gentoo.org> (31 Jan 2008)
# Masked for removal in 30 days. Replaced by
# x11-plugins/bfm with USE=gkrellm. Bug #207720
@@ -593,9 +599,6 @@ dev-lang/entity
# Live SVN ebuilds
~app-emacs/gentoo-syntax-9999
~app-emacs/ngnus-9999
-# Live CVS of Emacs unicode-2 branch
-~app-editors/emacs-cvs-23.0.60
->=virtual/emacs-23
# Marijn Schouten <hkBst@gentoo.org> (20 Dec 2007)
# Broken, bug 202880