6 files changed, 17 insertions, 13 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index b54b9fbca2c6..5e1ca52920d4 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.356 2009/12/21 07:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.357 2009/12/27 19:00:54 ulm Exp $
+
+  27 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.
 
   20 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
   emacs-22.3-r3.ebuild:
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
index 9c4dd7c70b76..69763fccc9f0 100644
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ b/app-editors/emacs/emacs-18.59-r6.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-18.59-r6.ebuild,v 1.6 2009/11/25 11:26:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.7 2009/12/27 19:00:54 ulm Exp $
 
 EAPI=2
 
@@ -64,7 +64,7 @@ src_configure() {
 
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	SANDBOX_ON=0
+	export SANDBOX_ON=0
 	emake --jobs=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
 }
 
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
index 69c98b928e9b..8811628c143b 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.15 2009/12/21 07:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.16 2009/12/27 19:00:54 ulm Exp $
 
 EAPI=2
 
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-cvs-22.1
+	!<app-editors/emacs-vcs-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 cff0f6c62338..6a496be77cf9 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.9 2009/12/21 07:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.10 2009/12/27 19:00:54 ulm Exp $
 
 EAPI=2
 
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-cvs-22.1
+	!<app-editors/emacs-vcs-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 01710830edb8..bb4574061a21 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.8 2009/12/21 07:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.9 2009/12/27 19:00:54 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-cvs-23.0*
-	!=app-editors/emacs-cvs-23.1.9999
+RDEPEND="!=app-editors/emacs-vcs-23.0*
+	!=app-editors/emacs-vcs-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 d76047a2a0a3..12e200cbefce 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.15 2009/12/21 07:08:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild,v 1.16 2009/12/27 19:00:54 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-cvs-23.0*
-	!=app-editors/emacs-cvs-23.1.9999
+RDEPEND="!=app-editors/emacs-vcs-23.0*
+	!=app-editors/emacs-vcs-23.1.9999
 	sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
 	net-libs/liblockfile