summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Polatel <hawking@gentoo.org>2008-02-04 15:28:04 +0000
committerAli Polatel <hawking@gentoo.org>2008-02-04 15:28:04 +0000
commit699372ab39c3e534dfa283fecb029da96e1dfdde (patch)
treea3d7455ae456534228a556216af329cd13e4db62 /dev-python
parentamd64 stable (diff)
downloadgentoo-2-699372ab39c3e534dfa283fecb029da96e1dfdde.tar.gz
gentoo-2-699372ab39c3e534dfa283fecb029da96e1dfdde.tar.bz2
gentoo-2-699372ab39c3e534dfa283fecb029da96e1dfdde.zip
Drop old. Quoting.
(Portage version: 2.1.4.1)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/docutils/ChangeLog8
-rw-r--r--dev-python/docutils/docutils-0.3.5.ebuild71
-rw-r--r--dev-python/docutils/docutils-0.3.7.ebuild15
-rw-r--r--dev-python/docutils/docutils-0.3.9.ebuild99
-rw-r--r--dev-python/docutils/docutils-0.4-r1.ebuild121
-rw-r--r--dev-python/docutils/docutils-0.4-r2.ebuild17
-rw-r--r--dev-python/docutils/docutils-0.4-r3.ebuild3
-rw-r--r--dev-python/docutils/docutils-0.4.ebuild121
-rw-r--r--dev-python/docutils/files/docutils-0.3.5-extramodules.patch32
9 files changed, 23 insertions, 464 deletions
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 6fbd7eff3c65..5c02ee97f1dd 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/docutils
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.78 2008/01/02 06:17:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.79 2008/02/04 15:28:03 hawking Exp $
+
+ 04 Feb 2008; Ali Polatel <hawking@gentoo.org>
+ -files/docutils-0.3.5-extramodules.patch, -docutils-0.3.5.ebuild,
+ docutils-0.3.7.ebuild, -docutils-0.3.9.ebuild, -docutils-0.4.ebuild,
+ -docutils-0.4-r1.ebuild, docutils-0.4-r2.ebuild, docutils-0.4-r3.ebuild:
+ Drop old. Quoting.
02 Jan 2008; Jeroen Roovers <jer@gentoo.org> docutils-0.4-r3.ebuild:
Stable for HPPA (bug #203582).
diff --git a/dev-python/docutils/docutils-0.3.5.ebuild b/dev-python/docutils/docutils-0.3.5.ebuild
deleted file mode 100644
index 71024e1465c3..000000000000
--- a/dev-python/docutils/docutils-0.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.5.ebuild,v 1.12 2007/07/04 19:38:17 hawking Exp $
-
-inherit distutils eutils multilib
-
-DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
-HOMEPAGE="http://docutils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
- glep? ( mirror://gentoo/glep-${PV}.tbz2 )"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="alpha ~mips ppc ~sparc x86"
-IUSE="glep"
-
-DEPEND="<dev-lang/python-2.4"
-
-GLEP_SRC=${WORKDIR}/glep-${PV}
-
-src_unpack() {
- unpack ${A}
- # simplified algorithm to select installing optparse and textwrap
- epatch ${FILESDIR}/${P}-extramodules.patch
-}
-
-src_compile() {
- distutils_src_compile
-
- # Generate html docs from reStructured text sources
- PYTHONPATH=${S}/build/lib ${python} \
- tools/buildhtml.py --config=tools/docutils.conf
-}
-
-install_txt_doc() {
- local doc=${1}
- local dir="txt/$(dirname ${doc})"
- docinto ${dir}
- dodoc ${doc}
-}
-
-src_install() {
- DOCS="*.txt"
- distutils_src_install
- # Tools
- cd ${S}/tools
- for tool in *.py
- do
- newbin ${tool} docutils-${tool}
- done
- # Docs
- cd ${S}
- dohtml -r docs spec tools
- for doc in $(find docs spec tools -name '*.txt')
- do
- install_txt_doc $doc
- done
-
- # installing Gentoo GLEP tools. Uses versioned GLEP distribution
- if use glep
- then
- distutils_python_version
- newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
- newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
- newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
- newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
- fi
-}
diff --git a/dev-python/docutils/docutils-0.3.7.ebuild b/dev-python/docutils/docutils-0.3.7.ebuild
index 4ca46581342e..ebc66e9b3c36 100644
--- a/dev-python/docutils/docutils-0.3.7.ebuild
+++ b/dev-python/docutils/docutils-0.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.7.ebuild,v 1.18 2007/07/04 19:38:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.7.ebuild,v 1.19 2008/02/04 15:28:03 hawking Exp $
inherit distutils eutils elisp-common multilib
@@ -23,7 +23,7 @@ GLEP_SRC=${WORKDIR}/glep-${PV}
src_unpack() {
unpack ${A}
# simplified algorithm to select installing optparse and textwrap
- epatch ${FILESDIR}/${P}-extramodules.patch
+ epatch "${FILESDIR}"/${P}-extramodules.patch
}
src_compile() {
@@ -45,22 +45,21 @@ install_txt_doc() {
}
src_test() {
- cd ${S}/test
+ cd "${S}"/test
PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
}
src_install() {
- cd ${S}
DOCS="*.txt"
distutils_src_install
# Tools
- cd ${S}/tools
+ cd "${S}"/tools
for tool in *.py
do
newbin ${tool} docutils-${tool}
done
# Docs
- cd ${S}
+ cd "${S}"
dohtml -r docs spec tools
for doc in $(find docs spec tools -name '*.txt')
do
@@ -82,7 +81,7 @@ src_install() {
if use emacs; then
elisp-install ${PN} tools/editors/emacs/*.{elc,el}
- elisp-site-file-install ${FILESDIR}/${SITEFILE}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
fi
}
diff --git a/dev-python/docutils/docutils-0.3.9.ebuild b/dev-python/docutils/docutils-0.3.9.ebuild
deleted file mode 100644
index f3afa010d0cf..000000000000
--- a/dev-python/docutils/docutils-0.3.9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.9.ebuild,v 1.14 2007/07/04 19:38:18 hawking Exp $
-
-inherit distutils eutils elisp-common multilib
-
-DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
-HOMEPAGE="http://docutils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
- glep? ( mirror://gentoo/glep-${PV}.tbz2 )"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="glep emacs"
-DEPEND=">=dev-lang/python-2.3
- emacs? ( virtual/emacs )"
-
-EMP=${PN}-0.3.7
-SITEFILE=50docutils-gentoo.el
-
-GLEP_SRC=${WORKDIR}/glep-${PV}
-
-src_unpack() {
- unpack ${A}
- # simplified algorithm to select installing optparse and textwrap
- cd ${S}
- epatch ${FILESDIR}/${EMP}-extramodules.patch
-}
-
-src_compile() {
- distutils_src_compile
-
- # Generate html docs from reStructured text sources
- PYTHONPATH=${S}/build/lib ${python} \
- tools/buildhtml.py --config=tools/docutils.conf
- if use emacs; then
- pushd tools/editors/emacs; elisp-compile *.el; popd
- fi
-}
-
-install_txt_doc() {
- local doc=${1}
- local dir="txt/$(dirname ${doc})"
- docinto ${dir}
- dodoc ${doc}
-}
-
-src_test() {
- cd ${S}/test
- PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
-}
-
-src_install() {
- cd ${S}
- DOCS="*.txt"
- distutils_src_install
- # Tools
- cd ${S}/tools
- for tool in *.py
- do
- dobin ${tool}
- done
- # Docs
- cd ${S}
- dohtml -r docs spec tools
- for doc in $(find docs spec tools -name '*.txt')
- do
- install_txt_doc $doc
- done
-
- # installing Gentoo GLEP tools. Uses versioned GLEP distribution
- if use glep
- then
- distutils_python_version
- newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
- newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
- newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
- newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
- fi
-
- if use emacs; then
- elisp-install ${PN} tools/editors/emacs/*.{elc,el}
- elisp-site-file-install ${FILESDIR}/${SITEFILE}
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- distutils_pkg_postrm
-}
diff --git a/dev-python/docutils/docutils-0.4-r1.ebuild b/dev-python/docutils/docutils-0.4-r1.ebuild
deleted file mode 100644
index 37074fed6d30..000000000000
--- a/dev-python/docutils/docutils-0.4-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r1.ebuild,v 1.6 2007/07/04 19:38:17 hawking Exp $
-
-inherit distutils eutils elisp-common multilib
-
-DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc..."
-HOMEPAGE="http://docutils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
- glep? ( mirror://gentoo/glep-${PVR}.tbz2 )"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="glep emacs"
-
-DEPEND=">=dev-lang/python-2.3
- emacs? ( virtual/emacs )"
-
-EMP=${PN}-0.3.7
-SITEFILE=50docutils-0.4-gentoo.el
-
-GLEP_SRC=${WORKDIR}/glep-${PVR}
-
-src_unpack() {
- unpack ${A}
- # simplified algorithm to select installing optparse and textwrap
- cd ${S}
- epatch ${FILESDIR}/${EMP}-extramodules.patch
- # Fix for Python 2.5 test (bug# 172557)
- epatch ${FILESDIR}/${P}-python-2.5-fix.patch
-}
-
-src_compile() {
- distutils_src_compile
-
- # Generate html docs from reStructured text sources.
-
- # make roman.py available for the doc building process
- ln -s extras/roman.py
-
- pushd tools
-
- # Place html4css1.css in base directory. This makes sure the
- # generated reference to it is correct.
- cp ../docutils/writers/html4css1/html4css1.css ..
-
- PYTHONPATH=.. ${python} ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. \
- || die "buildhtml"
-
- popd
-
- # clean up after the doc building
- rm roman.py html4css1.css
-
- if use emacs; then
- pushd tools/editors/emacs; elisp-compile *.el; popd
- fi
-}
-
-install_txt_doc() {
- local doc=${1}
- local dir="txt/$(dirname ${doc})"
- docinto ${dir}
- dodoc ${doc}
-}
-
-src_test() {
- cd ${S}/test
- PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
-}
-
-src_install() {
- cd ${S}
- DOCS="*.txt"
- distutils_src_install
- # Tools
- cd ${S}/tools
- for tool in *.py
- do
- dobin ${tool}
- done
- # Docs
- cd ${S}
- dohtml -r docs tools
- # manually install the stylesheet file
- insinto /usr/share/doc/${PF}/html
- doins docutils/writers/html4css1/html4css1.css
- for doc in $(find docs tools -name '*.txt')
- do
- install_txt_doc $doc
- done
-
- # installing Gentoo GLEP tools. Uses versioned GLEP distribution
- if use glep
- then
- distutils_python_version
- dobin ${GLEP_SRC}/glep.py || die "newbin failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
- newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
- newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
- doins -r ${GLEP_SRC}/glep_html || die "doins writer failed"
- fi
-
- if use emacs; then
- elisp-install ${PN} tools/editors/emacs/*.{elc,el}
- elisp-site-file-install ${FILESDIR}/${SITEFILE}
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- distutils_pkg_postrm
-}
diff --git a/dev-python/docutils/docutils-0.4-r2.ebuild b/dev-python/docutils/docutils-0.4-r2.ebuild
index 88e64844ffea..29a6424842ce 100644
--- a/dev-python/docutils/docutils-0.4-r2.ebuild
+++ b/dev-python/docutils/docutils-0.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r2.ebuild,v 1.11 2007/08/25 22:28:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r2.ebuild,v 1.12 2008/02/04 15:28:03 hawking Exp $
inherit distutils eutils multilib
@@ -25,10 +25,10 @@ GLEP_SRC=${WORKDIR}/glep-${PV}-r1
src_unpack() {
unpack ${A}
# simplified algorithm to select installing optparse and textwrap
- cd ${S}
- epatch ${FILESDIR}/${EMP}-extramodules.patch
+ cd "${S}"
+ epatch "${FILESDIR}"/${EMP}-extramodules.patch
# Fix for Python 2.5 test (bug# 172557)
- epatch ${FILESDIR}/${P}-python-2.5-fix.patch
+ epatch "${FILESDIR}"/${P}-python-2.5-fix.patch
}
src_compile() {
@@ -62,22 +62,21 @@ install_txt_doc() {
}
src_test() {
- cd ${S}/test
+ cd "${S}"/test
PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
}
src_install() {
- cd ${S}
DOCS="*.txt"
distutils_src_install
# Tools
- cd ${S}/tools
+ cd "${S}"/tools
for tool in *.py
do
dobin ${tool}
done
# Docs
- cd ${S}
+ cd "${S}"
dohtml -r docs tools
# manually install the stylesheet file
insinto /usr/share/doc/${PF}/html
diff --git a/dev-python/docutils/docutils-0.4-r3.ebuild b/dev-python/docutils/docutils-0.4-r3.ebuild
index 772580c79aa6..6f4aea2a5d44 100644
--- a/dev-python/docutils/docutils-0.4-r3.ebuild
+++ b/dev-python/docutils/docutils-0.4-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r3.ebuild,v 1.9 2008/01/10 09:35:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4-r3.ebuild,v 1.10 2008/02/04 15:28:03 hawking Exp $
NEED_PYTHON=2.4
@@ -73,7 +73,6 @@ src_test() {
}
src_install() {
- cd "${S}"
DOCS="*.txt"
distutils_src_install
# Tools
diff --git a/dev-python/docutils/docutils-0.4.ebuild b/dev-python/docutils/docutils-0.4.ebuild
deleted file mode 100644
index 481c5aab8402..000000000000
--- a/dev-python/docutils/docutils-0.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.4.ebuild,v 1.15 2007/07/04 19:38:17 hawking Exp $
-
-inherit distutils eutils elisp-common multilib
-
-DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc..."
-HOMEPAGE="http://docutils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
- glep? ( mirror://gentoo/glep-${PV}.tbz2 )"
-
-LICENSE="public-domain PYTHON BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="glep emacs"
-
-DEPEND=">=dev-lang/python-2.3
- emacs? ( virtual/emacs )"
-
-EMP=${PN}-0.3.7
-SITEFILE=50docutils-0.4-gentoo.el
-
-GLEP_SRC=${WORKDIR}/glep-${PV}
-
-src_unpack() {
- unpack ${A}
- # simplified algorithm to select installing optparse and textwrap
- cd ${S}
- epatch ${FILESDIR}/${EMP}-extramodules.patch
- # Fix for Python 2.5 test (bug# 172557)
- epatch ${FILESDIR}/${P}-python-2.5-fix.patch
-}
-
-src_compile() {
- distutils_src_compile
-
- # Generate html docs from reStructured text sources.
-
- # make roman.py available for the doc building process
- ln -s extras/roman.py
-
- pushd tools
-
- # Place html4css1.css in base directory. This makes sure the
- # generated reference to it is correct.
- cp ../docutils/writers/html4css1/html4css1.css ..
-
- PYTHONPATH=.. ${python} ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. \
- || die "buildhtml"
-
- popd
-
- # clean up after the doc building
- rm roman.py html4css1.css
-
- if use emacs; then
- pushd tools/editors/emacs; elisp-compile *.el; popd
- fi
-}
-
-install_txt_doc() {
- local doc=${1}
- local dir="txt/$(dirname ${doc})"
- docinto ${dir}
- dodoc ${doc}
-}
-
-src_test() {
- cd ${S}/test
- PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
-}
-
-src_install() {
- cd ${S}
- DOCS="*.txt"
- distutils_src_install
- # Tools
- cd ${S}/tools
- for tool in *.py
- do
- dobin ${tool}
- done
- # Docs
- cd ${S}
- dohtml -r docs tools
- # manually install the stylesheet file
- insinto /usr/share/doc/${PF}/html
- doins docutils/writers/html4css1/html4css1.css
- for doc in $(find docs tools -name '*.txt')
- do
- install_txt_doc $doc
- done
-
- # installing Gentoo GLEP tools. Uses versioned GLEP distribution
- if use glep
- then
- distutils_python_version
- dobin ${GLEP_SRC}/glep.py || die "newbin failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/readers
- newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/transforms
- newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
- insinto /usr/$(get_libdir)/python${PYVER}/site-packages/docutils/writers
- doins -r ${GLEP_SRC}/glep_html || die "doins writer failed"
- fi
-
- if use emacs; then
- elisp-install ${PN} tools/editors/emacs/*.{elc,el}
- elisp-site-file-install ${FILESDIR}/${SITEFILE}
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- distutils_pkg_postrm
-}
diff --git a/dev-python/docutils/files/docutils-0.3.5-extramodules.patch b/dev-python/docutils/files/docutils-0.3.5-extramodules.patch
deleted file mode 100644
index d4f0f60d2e32..000000000000
--- a/dev-python/docutils/files/docutils-0.3.5-extramodules.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- docutils-0.3.5/setup.py 2004-07-29 16:57:28.000000000 +0200
-+++ docutils-0.3.5/setup.py.new 2004-09-23 10:06:06.263010624 +0200
-@@ -82,20 +82,15 @@
- List of (module name, minimum __version__ string, [attribute names])."""
-
- def get_extras():
-- extras = []
-- for module_name, version, attributes in extra_modules:
-- try:
-- module = __import__(module_name)
-- if version and module.__version__ < version:
-- raise ValueError
-- for attribute in attributes or []:
-- getattr(module, attribute)
-- print ('"%s" module already present; ignoring extras/%s.py.'
-- % (module_name, module_name))
-- except (ImportError, AttributeError, ValueError):
-- extras.append(module_name)
-- return extras
--
-+ # old method does not work for upgrading/downgrading docutils.
-+ # so we use a simple rule, 'optparse' and 'textwrap' are not installed
-+ # for >=python-2.3
-+
-+ pyver = sys.version_info
-+ if pyver[0] == 2 and pyver[1] > 2:
-+ return ["roman"]
-+ else:
-+ return ["optparse","textwrap","roman"]
-
- class dual_build_py(build_py):
-