Don't PDEPEND on app-emacs/rst; it is included with Emacs 23.

(Portage version: 2.1.10.19/cvs/Linux x86_64)

4 files changed, 11 insertions, 13 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 48df3f257933..950e02507405 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.137 2011/09/04 07:25:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.138 2011/09/26 20:30:10 ulm Exp $
+
+  26 Sep 2011; Ulrich Mueller <ulm@gentoo.org> docutils-0.7.ebuild,
+  docutils-0.8.ebuild, docutils-0.8.1.ebuild:
+  Don't PDEPEND on app-emacs/rst; it is included with Emacs 23.
 
   04 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> -docutils-0.8_pre7013.ebuild,
   -docutils-0.8_pre7031.ebuild, -docutils-0.8_pre7034.ebuild,
diff --git a/dev-python/docutils/docutils-0.7.ebuild b/dev-python/docutils/docutils-0.7.ebuild
index acad8cf5ba37..1dfd798d84f4 100644
--- a/dev-python/docutils/docutils-0.7.ebuild
+++ b/dev-python/docutils/docutils-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.7.ebuild,v 1.18 2011/04/20 22:00:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.7.ebuild,v 1.19 2011/09/26 20:30:10 ulm Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="glep emacs"
+IUSE="glep"
 
 DEPEND=">=app-shells/bash-4
 	dev-python/setuptools"
 RDEPEND=""
-# Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242)
-PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )"
 
 DOCS="*.txt"
 PYTHON_MODNAME="docutils roman.py"
diff --git a/dev-python/docutils/docutils-0.8.1.ebuild b/dev-python/docutils/docutils-0.8.1.ebuild
index a2b6fb9c61e5..44ab4f0982a0 100644
--- a/dev-python/docutils/docutils-0.8.1.ebuild
+++ b/dev-python/docutils/docutils-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.8.1.ebuild,v 1.1 2011/09/04 07:23:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.8.1.ebuild,v 1.2 2011/09/26 20:30:10 ulm Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,12 +19,10 @@ SRC_URI+=" glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )"
 LICENSE="BSD-2 GPL-3 PSF-2 public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs glep"
+IUSE="glep"
 
 DEPEND="dev-python/setuptools"
 RDEPEND=""
-# Avoid circular dependency.
-PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )"
 
 DOCS="*.txt"
 PYTHON_MODNAME="docutils roman.py"
diff --git a/dev-python/docutils/docutils-0.8.ebuild b/dev-python/docutils/docutils-0.8.ebuild
index fd4986d73453..133cf169c148 100644
--- a/dev-python/docutils/docutils-0.8.ebuild
+++ b/dev-python/docutils/docutils-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.8.ebuild,v 1.1 2011/08/06 16:34:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.8.ebuild,v 1.2 2011/09/26 20:30:10 ulm Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,12 +19,10 @@ SRC_URI+=" glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )"
 LICENSE="BSD-2 GPL-3 PSF-2 public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs glep"
+IUSE="glep"
 
 DEPEND="dev-python/setuptools"
 RDEPEND=""
-# Avoid circular dependency.
-PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )"
 
 DOCS="*.txt"
 PYTHON_MODNAME="docutils roman.py"