Emacs 23 includes rst-mode now, change PDEPEND accordingly.

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

4 files changed, 22 insertions, 8 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 20aeee51c03f..7f19094d327b 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.93 2009/09/12 21:20:39 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.94 2009/09/20 19:01:24 ulm Exp $
+
+  20 Sep 2009; Ulrich Mueller <ulm@gentoo.org> docutils-0.5.ebuild,
+  docutils-0.5-r1.ebuild:
+  Emacs 23 includes rst-mode now, change PDEPEND accordingly.
 
   12 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -files/50docutils-gentoo.el, -docutils-0.3.7.ebuild,
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index e59c7f6403b1..1dae6912003e 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX docutils-0.3.7-extramodules.patch 1163 RMD160 4d7c0f935816f631b87cf58dbf228de931102e4f SHA1 2886d52101f12a6b6b04e75b2a4223b68c953af0 SHA256 c375dc4d7228c051a6dc6dd586fea7789703fb4d3b7c8c5bad4375f0a9e74aaa
 AUX docutils-0.5-test_node_class_names-python-2.6.patch 533 RMD160 5fa8c2010e79217a0a108e4b1abbe9395e2660ce SHA1 b867020da19157be143123cf7ad84d22eee87460 SHA256 57049d19bee982b79d2bde4c6571f2a38c121b841443cda902f90d3fdd97f081
 DIST docutils-0.5.tar.gz 1271981 RMD160 3e8dfd2923528bbeac0ca33ccfe6f576c74f1886 SHA1 70ca2dd94969ddf76217e5fe907b0b23f16cc199 SHA256 747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e
 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058
-EBUILD docutils-0.5-r1.ebuild 3143 RMD160 0a2155152806ffbe8bef3235a30d14ce94374f60 SHA1 bf5e100a1e3d765d493428c58b7c744cb5c4aa51 SHA256 262e3a60cd4a2d3bfb18e3c7c21e1342f9cedfa3b2f459cb428377333d4a7f80
-EBUILD docutils-0.5.ebuild 2852 RMD160 901e7b21d2afe155e55bcce9d73c3676f024597b SHA1 5650567da54fe7c71b39dddbba75d242d02dc571 SHA256 ab74fcff7c94ba6bc47fda9dfe4ce928d242bdb8c7163e67c6b7ebbf1402b6e2
-MISC ChangeLog 13939 RMD160 194017d9d9d9babb199297249cb2de56ccf3b1cf SHA1 b09a2796d80a97796f8eecd135e93bc85dc14545 SHA256 2df9c23f394ae80be56e0af5f46aee6e96a2d6a883659958a722e7afbd735a16
+EBUILD docutils-0.5-r1.ebuild 3164 RMD160 231afd26eadcf9796304a2e066a7acecef27dbae SHA1 684f0bf34ff2f0ac0ba591b7fd3e4e0a023102f7 SHA256 61088c0e327033e0c61a317d88e79789f5f3ba7e1e71dc425b1a90527a2a93c3
+EBUILD docutils-0.5.ebuild 2874 RMD160 555494f496bc1138bdea9aa33af43f3062131fbf SHA1 3d7133f6f24e8c280208de5c7aa3fe62f1668fab SHA256 8ca2a5e9b4b30e51d970af183d945547dad4bd0b166766dd4a326bf2540c8bc7
+MISC ChangeLog 14091 RMD160 83f76337607ae82c25e6764ded460f55a646bd5b SHA1 98b2b09a0c783fe2dcccf2f19722ef03deb878cf SHA256 cb55a65f7116cd0c2bbf8a387cc20e331256342c7e625c09d83b61da569c9373
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAkq2fIsACgkQOeoy/oIi7uzb0wCg2NlR4J8Wt0vWWtt/JQy3I3ie
+mx0AoMuYHc+UyPWyU/kXImrlf5ywqldG
+=7myw
+-----END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.5-r1.ebuild b/dev-python/docutils/docutils-0.5-r1.ebuild
index ee8c6f05058f..644f7abf72fb 100644
--- a/dev-python/docutils/docutils-0.5-r1.ebuild
+++ b/dev-python/docutils/docutils-0.5-r1.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/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.1 2009/08/12 01:17:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.2 2009/09/20 19:01:24 ulm Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ IUSE="glep emacs"
 DEPEND="dev-python/setuptools"
 RDEPEND=""
 # Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242)
-PDEPEND="emacs? ( >=app-emacs/rst-0.4 )"
+PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )"
 
 RESTRICT_PYTHON_ABIS="3*"
 
diff --git a/dev-python/docutils/docutils-0.5.ebuild b/dev-python/docutils/docutils-0.5.ebuild
index beebb8c96eee..5ff72bfa9c11 100644
--- a/dev-python/docutils/docutils-0.5.ebuild
+++ b/dev-python/docutils/docutils-0.5.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/dev-python/docutils/docutils-0.5.ebuild,v 1.9 2009/08/12 00:50:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5.ebuild,v 1.10 2009/09/20 19:01:24 ulm Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ IUSE="glep emacs"
 
 DEPEND="dev-python/setuptools"
 # Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242)
-PDEPEND="emacs? ( >=app-emacs/rst-0.4 )"
+PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )"
 
 EMP=${PN}-0.3.7