Undo accidental commit.

(Portage version: 2.2_rc60/cvs/Linux i686)

5 files changed, 11 insertions, 15 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 8ddd96741851..b54b9fbca2c6 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.355 2009/12/20 13:12:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.356 2009/12/21 07:08:45 ulm Exp $
 
   20 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
   emacs-22.3-r3.ebuild:
@@ -11,10 +11,6 @@
   emacs-23.1-r2.ebuild:
   Change X11 to MIT in LICENSE.
 
-  14 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r2.ebuild,
-  emacs-22.3-r3.ebuild, emacs-23.1.ebuild, emacs-23.1-r2.ebuild:
-  Update blockers after package move from emacs-cvs to emacs-vcs.
-
   11 Dec 2009; Tiago Cunha <tcunha@gentoo.org> emacs-23.1-r2.ebuild:
   stable sparc, bug 296159
 
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
index 97fed3a8e3f7..69c98b928e9b 100644
--- a/app-editors/emacs/emacs-22.3-r2.ebuild
+++ b/app-editors/emacs/emacs-22.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.14 2009/12/15 09:25:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.15 2009/12/21 07:08:45 ulm Exp $
 
 EAPI=2
 
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-22.1
+	!<app-editors/emacs-cvs-22.1
 	>=app-emacs/emacs-common-gentoo-1[X?]"
 
 # FULL_VERSION keeps the full version number, which is needed in order to
diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild
index ee427aaf767d..cff0f6c62338 100644
--- a/app-editors/emacs/emacs-22.3-r3.ebuild
+++ b/app-editors/emacs/emacs-22.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.8 2009/12/20 10:34:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.9 2009/12/21 07:08:45 ulm Exp $
 
 EAPI=2
 
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-22.1
+	!<app-editors/emacs-cvs-22.1
 	>=app-emacs/emacs-common-gentoo-1[X?]"
 
 # FULL_VERSION keeps the full version number, which is needed in order to
diff --git a/app-editors/emacs/emacs-23.1-r2.ebuild b/app-editors/emacs/emacs-23.1-r2.ebuild
index 8118bc66440d..01710830edb8 100644
--- a/app-editors/emacs/emacs-23.1-r2.ebuild
+++ b/app-editors/emacs/emacs-23.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.7 2009/12/15 09:25:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.8 2009/12/21 07:08:45 ulm Exp $
 
 EAPI=2
 
@@ -34,8 +34,8 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbs
 IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 RESTRICT="strip"
 
-RDEPEND="!=app-editors/emacs-vcs-23.0*
-	!=app-editors/emacs-vcs-23.1.9999
+RDEPEND="!=app-editors/emacs-cvs-23.0*
+	!=app-editors/emacs-cvs-23.1.9999
 	sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
 	net-libs/liblockfile
diff --git a/app-editors/emacs/emacs-23.1.ebuild b/app-editors/emacs/emacs-23.1.ebuild
index d422e16b5bd2..d76047a2a0a3 100644
--- a/app-editors/emacs/emacs-23.1.ebuild
+++ b/app-editors/emacs/emacs-23.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild,v 1.14 2009/12/15 09:25:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild,v 1.15 2009/12/21 07:08:45 ulm Exp $
 
 EAPI=2
 
@@ -34,8 +34,8 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x8
 IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 RESTRICT="strip"
 
-RDEPEND="!=app-editors/emacs-vcs-23.0*
-	!=app-editors/emacs-vcs-23.1.9999
+RDEPEND="!=app-editors/emacs-cvs-23.0*
+	!=app-editors/emacs-cvs-23.1.9999
 	sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
 	net-libs/liblockfile