Update RDEPEND and KEYWORDS following the 22.1 release.

Package-Manager: portage-2.1.2.9

4 files changed, 28 insertions, 21 deletions

diff --git a/virtual/emacs/ChangeLog b/virtual/emacs/ChangeLog
index 3cf9375b360e..6c06e2419243 100644
--- a/virtual/emacs/ChangeLog
+++ b/virtual/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for virtual/emacs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/ChangeLog,v 1.2 2007/05/14 21:27:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/ChangeLog,v 1.3 2007/06/02 13:14:29 ulm Exp $
+
+  02 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.ebuild,
+  emacs-23.ebuild:
+  Update RDEPEND and KEYWORDS following release of Emacs 22.1.
 
 *emacs-23 (14 May 2007)
 *emacs-22 (14 May 2007)
diff --git a/virtual/emacs/Manifest b/virtual/emacs/Manifest
index cf09545186f3..a84808239af2 100644
--- a/virtual/emacs/Manifest
+++ b/virtual/emacs/Manifest
@@ -5,18 +5,18 @@ EBUILD emacs-21.ebuild 494 RMD160 4767fa0d735f6cb3273a8194c3fb6d1c08afa5f8 SHA1
 MD5 36a67428d1bfa2e750b2e47fe68c7266 emacs-21.ebuild 494
 RMD160 4767fa0d735f6cb3273a8194c3fb6d1c08afa5f8 emacs-21.ebuild 494
 SHA256 e62c1e66fc00aa613cce48f5848620df9ebaaf30fed4da8310e76d4cc723347e emacs-21.ebuild 494
-EBUILD emacs-22.ebuild 474 RMD160 66b2d8ad65d438eb23df9a20ea8ba7f6573171d1 SHA1 0e6a050691a54c89979871bfa046579f2830d628 SHA256 1d2477d1e0b1b8c3cd4325ec337b46be18f9ceb5c69076912cad64646354d49e
-MD5 2ec4920fdefd5abbd59890fdeeb56af7 emacs-22.ebuild 474
-RMD160 66b2d8ad65d438eb23df9a20ea8ba7f6573171d1 emacs-22.ebuild 474
-SHA256 1d2477d1e0b1b8c3cd4325ec337b46be18f9ceb5c69076912cad64646354d49e emacs-22.ebuild 474
-EBUILD emacs-23.ebuild 445 RMD160 ed106a580b20420dd438a44228717f824199fc8b SHA1 f113d0ac291780797da3f665b8701ff2d8b16ec8 SHA256 9561b6b48fdb0fbbbe57a4d8b7e735cb2eff7b4946845e46e54b179ccad03c76
-MD5 c532695e8cde74303261d7b6881d3c7c emacs-23.ebuild 445
-RMD160 ed106a580b20420dd438a44228717f824199fc8b emacs-23.ebuild 445
-SHA256 9561b6b48fdb0fbbbe57a4d8b7e735cb2eff7b4946845e46e54b179ccad03c76 emacs-23.ebuild 445
-MISC ChangeLog 463 RMD160 5f180e2d5694ac24329833a47ac81ff920d52389 SHA1 b94cb16ee6175ec01f82266a37070c98d5c6b0c4 SHA256 ca6eef76de3694da7e1f6f3bdf028949286555a49a487f3e7c0fdebcb7bd7cc5
-MD5 ff7d6c0b0987776d980280de54cef019 ChangeLog 463
-RMD160 5f180e2d5694ac24329833a47ac81ff920d52389 ChangeLog 463
-SHA256 ca6eef76de3694da7e1f6f3bdf028949286555a49a487f3e7c0fdebcb7bd7cc5 ChangeLog 463
+EBUILD emacs-22.ebuild 512 RMD160 73c2bf846d69ea1df1c44813a417915d20e923d0 SHA1 0d22344b640b4cd66a89e80310439701b6b76e22 SHA256 a6ee7493c8b3dd683b7ed6e227949d19ee97cbca8acc817147bf81cca47c8a07
+MD5 036026c5e0e036807ce0ea5f5a92cb29 emacs-22.ebuild 512
+RMD160 73c2bf846d69ea1df1c44813a417915d20e923d0 emacs-22.ebuild 512
+SHA256 a6ee7493c8b3dd683b7ed6e227949d19ee97cbca8acc817147bf81cca47c8a07 emacs-22.ebuild 512
+EBUILD emacs-23.ebuild 455 RMD160 9b7249d89358a6d982e809c71329ccf6006f22df SHA1 7a8548b651988dfbb4063f6ccddeb96b51f02276 SHA256 8e3ceee6822dd8bf3d44be26f68ac5a1d5ea412caff4cc9c047a35687919a859
+MD5 2ad39bdecab98f5c09696ef69b7780bb emacs-23.ebuild 455
+RMD160 9b7249d89358a6d982e809c71329ccf6006f22df emacs-23.ebuild 455
+SHA256 8e3ceee6822dd8bf3d44be26f68ac5a1d5ea412caff4cc9c047a35687919a859 emacs-23.ebuild 455
+MISC ChangeLog 610 RMD160 86a28961a41d17e8c85317272adcb2ed69d4c081 SHA1 712d3e4a97c8998f824744e9dc81b1891d90d02b SHA256 345f965886d02e2a69be1e57d4974fdccaf4c06be3a62dfc501684f2d93dd23b
+MD5 4fa786c3b537395f6da486725b4aaad9 ChangeLog 610
+RMD160 86a28961a41d17e8c85317272adcb2ed69d4c081 ChangeLog 610
+SHA256 345f965886d02e2a69be1e57d4974fdccaf4c06be3a62dfc501684f2d93dd23b ChangeLog 610
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -33,7 +33,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGSPOROeoy/oIi7uwRAkzVAJ97puF+x/TdcW/AWIlt5mIaj3fGWwCaA1do
-7GuFfXE8ijVK5aJvMTqxMe0=
-=4pn3
+iD8DBQFGYW06Oeoy/oIi7uwRAjEsAKCF7xLWLJx7g+lvwQypVzMd7fbNWwCfaPEK
+LfVOw6V0aZtazGIHryqqMmk=
+=QXxR
 -----END PGP SIGNATURE-----
diff --git a/virtual/emacs/emacs-22.ebuild b/virtual/emacs/emacs-22.ebuild
index eb30991103b7..1b8b40985bc5 100644
--- a/virtual/emacs/emacs-22.ebuild
+++ b/virtual/emacs/emacs-22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-22.ebuild,v 1.2 2007/05/14 23:38:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-22.ebuild,v 1.3 2007/06/02 13:14:29 ulm Exp $
 
 DESCRIPTION="Virtual for GNU Emacs"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
@@ -9,8 +9,11 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 #KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-KEYWORDS="~sparc-fbsd"
+KEYWORDS="~sparc-fbsd ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="app-editors/emacs-cvs"
+RDEPEND="|| (
+	=app-editors/emacs-22*
+	app-editors/emacs-cvs
+	)"
diff --git a/virtual/emacs/emacs-23.ebuild b/virtual/emacs/emacs-23.ebuild
index df39c239f48c..893329ac6eb1 100644
--- a/virtual/emacs/emacs-23.ebuild
+++ b/virtual/emacs/emacs-23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-23.ebuild,v 1.1 2007/05/14 21:24:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-23.ebuild,v 1.2 2007/06/02 13:14:29 ulm Exp $
 
 DESCRIPTION="Virtual for GNU Emacs"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""