summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-12-27 19:05:54 +0000
committerUlrich Müller <ulm@gentoo.org>2009-12-27 19:05:54 +0000
commit5798ef81defeec8322705cd1417dcb38e1e752e3 (patch)
tree6a3fad0a0dbdac99e05990a56ef6815a3a293e24 /profiles
parentUpdate blockers after package move from emacs-cvs to emacs-vcs. (diff)
downloadhistorical-5798ef81defeec8322705cd1417dcb38e1e752e3.tar.gz
historical-5798ef81defeec8322705cd1417dcb38e1e752e3.tar.bz2
historical-5798ef81defeec8322705cd1417dcb38e1e752e3.zip
Move app-editors/emacs-cvs to app-editors/emacs-vcs.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask3
-rw-r--r--profiles/updates/4Q-20092
3 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 4ca0f5dde0a3..f764a344bcd7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3713 2009/12/27 16:50:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3714 2009/12/27 19:05:53 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!
+ 27 Dec 2009; Ulrich Mueller <ulm@gentoo.org> updates/4Q-2009,
+ package.mask:
+ Move app-editors/emacs-cvs to app-editors/emacs-vcs.
+
27 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Mask x11-themes/gtk-engines-qt for removal.
diff --git a/profiles/package.mask b/profiles/package.mask
index ee06f5b9e4be..72f6b0ff65c5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11011 2009/12/27 16:50:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11012 2009/12/27 19:05:53 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
@@ -241,7 +241,6 @@ app-crypt/qca-tls
# Ulrich Mueller <ulm@gentoo.org> (14 Dec 2009)
# Emacs live ebuild. Use at your own risk.
-~app-editors/emacs-cvs-23.1.9999
~app-editors/emacs-vcs-23.1.9999
# Diego E. Pettenò <flameeyes@gentoo.org> (14 Dec 2009)
diff --git a/profiles/updates/4Q-2009 b/profiles/updates/4Q-2009
index 3a0e3624d251..1e11ced41784 100644
--- a/profiles/updates/4Q-2009
+++ b/profiles/updates/4Q-2009
@@ -21,4 +21,4 @@ slotmove net-im/choqok 0 4
move x11-plugins/compiz-fusion-plugins-main x11-plugins/compiz-fusion-main
move x11-plugins/compiz-fusion-plugins-extra x11-plugins/compiz-fusion-extra
move x11-plugins/compiz-fusion-plugins-unsupported x11-plugins/compiz-fusion-unsupported
-
+move app-editors/emacs-cvs app-editors/emacs-vcs