Update blockers after package move from emacs-cvs to emacs-vcs.

Package-Manager: portage-2.2_rc60/cvs/Linux i686

7 files changed, 26 insertions, 22 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/Manifest b/app-editors/emacs/Manifest
index 949bb86a544b..cad927cbd851 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -13,18 +13,18 @@ DIST emacs-23.1-patches-1.tar.bz2 589 RMD160 d19e9af04e3f84628d165c0fe6c39707627
 DIST emacs-23.1-patches-3.tar.bz2 3216 RMD160 192809f005d1d6ceea827aa3d3a62ced027b2587 SHA1 7fbe229086edd02bd8ecd30660c4737859c67460 SHA256 03cd67610cc7b69021e8a30672e92ce61fc3eb1d3a69f0fde993bde80fddadf7
 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r6.ebuild 2776 RMD160 e37017eae2c4f7a520c4caf7bedb7d99fafea753 SHA1 9bb764bcdbe4a5a34610402bc8faf1661ac77844 SHA256 3d4ebfbcd25cbff20b115e964bd8ff65fbc5d4e6ba1338733060fbb013c39e70
+EBUILD emacs-18.59-r6.ebuild 2780 RMD160 7d858a366e6461c3061b10753733070764b3819d SHA1 2759b82bb2d0cffc98a7c6702e0f73914e86f6a6 SHA256 786c2f2388c0034534ce9d1c9a3d2b017026a66203f3943c542e5c6c30c75e0e
 EBUILD emacs-21.4-r19.ebuild 5034 RMD160 ae3a81c91285e5fc52fea697df30ca368c4deaa9 SHA1 3f9a1d72b9d290a5d55011d22c55d204d58d4e58 SHA256 36063e90b7458ec118c97b848e1ee5d2482811af0e14920c5fe6f687c67b7df0
-EBUILD emacs-22.3-r2.ebuild 7848 RMD160 42ee11b36a08ff8a43afb2a481cdaa98fc7d74a9 SHA1 ddf7d3ef86bf58049dc20e81ffc2e651028eed3c SHA256 db6166d7029b324d97f434975dd4dc7ed9881b19a501a683eb48f8c8230b2857
-EBUILD emacs-22.3-r3.ebuild 7619 RMD160 3ff295a2b1471c57c2f7f201c3fa0da016dfbaef SHA1 13dd27f49bc13666e62e031897e40a9df074b259 SHA256 fdf04459461c6f2a997bba63e2b4fbc327a86f21fa2dcab4fa85e114980b2b09
-EBUILD emacs-23.1-r2.ebuild 9388 RMD160 260a4b4086ff802f4e15d2a430dee0fde616d8e2 SHA1 2f7e46d99e866850ccde8d1412b96aa657943ea0 SHA256 c7a62e5091958267629ed46eec46c95a821cbd36ce66eb5dbb687dfedfc8164c
-EBUILD emacs-23.1.ebuild 9381 RMD160 468885b43976a27015311f85801b1161d30c6465 SHA1 ca2a5c1dc21ee8d1b8550bdb15370dcd7acabafb SHA256 f0cb7a10f2bd34fa1702c374cbc04cc06eea406b083595b9e80a3ca8993d7db2
-MISC ChangeLog 50551 RMD160 1d8fa372dc3dda8b59769d5485406643bec47ee4 SHA1 9c22896dc4da421fdeb39379515f99897fb623f7 SHA256 ccf0faef0ec63970811edc803c9e842fbf9ec1acde6f4267f25b24e45691eefa
+EBUILD emacs-22.3-r2.ebuild 7848 RMD160 13d81514be06a136f57982c28ad83753b52492f7 SHA1 5766944f33fdfa073632e312c9321c53f7053b22 SHA256 efc8f53cbe9f5eb5ca842f5e07545b86b2663c5804fe9b935c9379514db684f1
+EBUILD emacs-22.3-r3.ebuild 7620 RMD160 37a5ddc05ff14aa5436eb8da4ddf51cf573840dc SHA1 9004f5714f600526fc62d622f552e91182055c3f SHA256 6d3fa05c76d410ea04ec1dcb69672ff67d158a361db3b2897cffeba7ddf9936b
+EBUILD emacs-23.1-r2.ebuild 9388 RMD160 008271bea4cdbe3dd8cc3ddd73e33388e19826f2 SHA1 26584dcbd9979bbcfa8d5f30a514bfbe96bbaeba SHA256 dac0f7c7ae0f5a164e93df765f06d965f655f0f5524b322a2e74c2aa033ab51a
+EBUILD emacs-23.1.ebuild 9381 RMD160 d940f3961da3fce5ff2758a9cb4a9d21552c3310 SHA1 0b5a3c06944c9a01890365b860fc9570bca0230d SHA256 c306c9e76baf3953e79b8aef3e06e05033dde1dc3fb824ea722f885027b7a40f
+MISC ChangeLog 50752 RMD160 5bdc0cdfc70dac99bda8eb3d7c531702ad877528 SHA1 ba8c5f9a628923e1126188fa16573d4a27e04fcd SHA256 2c0ddae1fd661392a697466d378ef547f7daf8529eb0d8466c4403c47a71e452
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAksvH6IACgkQOeoy/oIi7uzlXwCfTwX21VxZ12UBVNNe9P7hsLrH
-unsAnRJSgnm7yxMbMZBFz39Cr9gBWVVx
-=NpkC
+iEYEARECAAYFAks3r4sACgkQOeoy/oIi7uzWLgCg5lsCxmJsLYai+k02ZJ3ZsrsD
+IrYAnjn22JknORpImzwXr7sSXTl2h+Vd
+=hoAs
 -----END PGP SIGNATURE-----
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