Change to slot dependencies and EAPI 2.

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

5 files changed, 34 insertions, 17 deletions

diff --git a/virtual/emacs/ChangeLog b/virtual/emacs/ChangeLog
index df5f0347aac2..a16b114c5f8a 100644
--- a/virtual/emacs/ChangeLog
+++ b/virtual/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for virtual/emacs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/ChangeLog,v 1.32 2009/09/27 19:16:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/ChangeLog,v 1.33 2009/09/27 20:21:00 ulm Exp $
+
+  27 Sep 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.ebuild,
+  emacs-22.ebuild, emacs-23.ebuild:
+  Change to slot dependencies and EAPI 2.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> emacs-23.ebuild:
   ppc stable #285063
diff --git a/virtual/emacs/Manifest b/virtual/emacs/Manifest
index 3587c81c0e70..85ab939b87d4 100644
--- a/virtual/emacs/Manifest
+++ b/virtual/emacs/Manifest
@@ -1,5 +1,15 @@
-EBUILD emacs-21.ebuild 416 RMD160 1f8b9e7e530f49075c75a00106cc329237a6416c SHA1 3a7e1f46405cddcfc3e3ea9ca38cfb31e830d4fc SHA256 e4438b2980bccb90e460fc18285de58aa476946282b4b19b1566fc0701752b51
-EBUILD emacs-22.ebuild 468 RMD160 00b1774da0dcbdf23e6b1be72eab732d44905999 SHA1 a01ed2d5714765fbe9ba9fc76fe36fecb3b31a5a SHA256 a5acbd2b113eb4428770b65cff4f7974f68e14c7f7b509be8e739f8ab47abe84
-EBUILD emacs-23.ebuild 473 RMD160 65ace6e5de5bcb03ba6cc4c6b920479c105f7b0f SHA1 166b15aabda28c6579e0dfe0e02c12f70ca44e99 SHA256 bdb1daa1a13bd8eccd0e9e856b3ffe4e8ff0fdfad0fada47036d79aa29f29108
-MISC ChangeLog 3567 RMD160 6cc32af132e5ded3af58170595d485e2ff9cc1fa SHA1 391754d56a71ab37330dd1ef74cc926135ca012f SHA256 27f4c9259dcd18e5fc3056400c2af5d12c46431da5999c4f3e7f0e0777316519
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD emacs-21.ebuild 422 RMD160 708da9c8b28ae180193804754d75164220e5b424 SHA1 43a395cf03b25740dfdc2016ae6094e92a2e80c4 SHA256 e55fef59988afe7e536d127b48107742aa0f2831cecc4e618d04180046973214
+EBUILD emacs-22.ebuild 435 RMD160 bcfe7a71afffe612736fb9f2123cdf48531b5bcb SHA1 07d118126fe81332e0c1fa5694538f41cb1863e1 SHA256 85bd1a826f1d9a968495f8123309312575913191dc1dc81dee5d40ab6170fb77
+EBUILD emacs-23.ebuild 474 RMD160 11ba51fce04b2506f41549beeb06ebadf173f389 SHA1 5698756717872c058b2e39254870dad2c0b9ced9 SHA256 84d2c814da813078e55b5a1092166df325d04f7d4d0d999eca50628b8d2fdf91
+MISC ChangeLog 3707 RMD160 193e5bbe634e26270e0cfd0906b809ca275480cd SHA1 730ff4c35066893cc0e7b5fb2a0716649c937bd0 SHA256 64dedcfcf557ce1604944558eea5546c894757b970e8db6cc84a111f284a4066
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAkq/ya4ACgkQOeoy/oIi7uxNuQCgviMCtjLMg10tk+lXJa6Hb74S
+tDQAn0yO0TY6kvfIpcUkKdZOyKd41MMk
+=ZdmH
+-----END PGP SIGNATURE-----
diff --git a/virtual/emacs/emacs-21.ebuild b/virtual/emacs/emacs-21.ebuild
index ff73688190bf..098c7e7a2b49 100644
--- a/virtual/emacs/emacs-21.ebuild
+++ b/virtual/emacs/emacs-21.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-21.ebuild,v 1.6 2008/05/29 13:35:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-21.ebuild,v 1.7 2009/09/27 20:21:00 ulm Exp $
+
+EAPI=2
 
 DESCRIPTION="Virtual for GNU Emacs"
 HOMEPAGE=""
@@ -12,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
-RDEPEND="=app-editors/emacs-21*"
+RDEPEND="app-editors/emacs:21"
diff --git a/virtual/emacs/emacs-22.ebuild b/virtual/emacs/emacs-22.ebuild
index 2cb2f91b063c..c266f8008d17 100644
--- a/virtual/emacs/emacs-22.ebuild
+++ b/virtual/emacs/emacs-22.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.24 2008/05/29 13:35:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-22.ebuild,v 1.25 2009/09/27 20:21:00 ulm Exp $
+
+EAPI=2
 
 DESCRIPTION="Virtual for GNU Emacs"
 HOMEPAGE=""
@@ -12,7 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| (
-		=app-editors/emacs-22*
-		>=app-editors/emacs-cvs-22
-	)"
+RDEPEND="app-editors/emacs:22"
diff --git a/virtual/emacs/emacs-23.ebuild b/virtual/emacs/emacs-23.ebuild
index 269e3adca7e7..804e3f4860cd 100644
--- a/virtual/emacs/emacs-23.ebuild
+++ b/virtual/emacs/emacs-23.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.18 2009/09/27 19:16:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/emacs/emacs-23.ebuild,v 1.19 2009/09/27 20:21:00 ulm Exp $
+
+EAPI=2
 
 DESCRIPTION="Virtual for GNU Emacs"
 HOMEPAGE=""
@@ -12,5 +14,5 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( =app-editors/emacs-23*
-		>=app-editors/emacs-cvs-23 )"
+RDEPEND="|| ( app-editors/emacs:23
+		app-editors/emacs-cvs:23 )"