Undo accidental commit.

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

6 files changed, 19 insertions, 23 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/Manifest b/app-editors/emacs/Manifest
index eb00de230724..949bb86a544b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,16 +15,16 @@ DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251
 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-21.4-r19.ebuild 5034 RMD160 ae3a81c91285e5fc52fea697df30ca368c4deaa9 SHA1 3f9a1d72b9d290a5d55011d22c55d204d58d4e58 SHA256 36063e90b7458ec118c97b848e1ee5d2482811af0e14920c5fe6f687c67b7df0
-EBUILD emacs-22.3-r2.ebuild 7848 RMD160 ad9dbae30f48143f1774f7cf3c6d9d5896c3927e SHA1 4935d931acfcc7a55ca6a528a7623c8697f3d5aa SHA256 d71fef378accc3f7668cc63cbf7a2850da4e1ea8c628e85f8ff39b28d97a41dd
-EBUILD emacs-22.3-r3.ebuild 7619 RMD160 a31292fa8034b13e3fe155bb3649d54a44462da8 SHA1 b36b0fd1891cef5d070ae94956bd7cfaafe1735f SHA256 aba9b2bd20293d06861f58fcadf5a97dc0dd3e0c955c6d42414262653eacd839
-EBUILD emacs-23.1-r2.ebuild 9388 RMD160 018836b0227d4c96f1471facdacff6c2a6f62ab7 SHA1 e63c53603b233c468d428f9f4ce87e4d34dba053 SHA256 09378991f62584383469f9222a6e96d30a88b0dd182dcccfb2d0083e7df5508c
-EBUILD emacs-23.1.ebuild 9381 RMD160 fe17580e7817dd0fafa9e7a4e8a7ce56be9e08b0 SHA1 a6411f5f82e0a2abd0263c417600c6c1fe3870a1 SHA256 50f8706d925c8661f83b57201dc7c6f6fbe3326861770e055b7a43a8f7817110
-MISC ChangeLog 50752 RMD160 e4b88854ecf8711e912881a063c338d96022a656 SHA1 49bcb0498b6dfffcffcb56ce54f08bd49b538a2e SHA256 043586de04b57a72de7f2239a765b63a8a2ef419660ba6aaa98e1ad6b41b2cc5
+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
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAksuI2UACgkQOeoy/oIi7uzONQCeK2Y9yX9pWftzT11Y4pBWDp2P
-7PQAoLSwZx/onIwFxTpcNjvQmW3dAZ1Z
-=DSVT
+iEYEARECAAYFAksvH6IACgkQOeoy/oIi7uzlXwCfTwX21VxZ12UBVNNe9P7hsLrH
+unsAnRJSgnm7yxMbMZBFz39Cr9gBWVVx
+=NpkC
 -----END PGP SIGNATURE-----
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