From 5b6edb4a3b74a81ee8d238aaabe59b8d8ff8246f Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 14 Oct 2015 01:03:10 +0200 Subject: dev-python/*: Restore keywords and un-revbump for py3.5 Restore keywords that were removed unnecessarily, and collapse unnecessary revbumps on packages with added python3.5 support. --- dev-python/sphinx/sphinx-1.2.3-r1.ebuild | 125 ----------------------------- dev-python/sphinx/sphinx-1.2.3.ebuild | 2 +- dev-python/sphinx/sphinx-1.3.1-r1.ebuild | 133 ------------------------------- dev-python/sphinx/sphinx-1.3.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 260 deletions(-) delete mode 100644 dev-python/sphinx/sphinx-1.2.3-r1.ebuild delete mode 100644 dev-python/sphinx/sphinx-1.3.1-r1.ebuild (limited to 'dev-python/sphinx') diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild deleted file mode 100644 index 171dd36ca1f2..000000000000 --- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 eutils versionator - -MY_PN="Sphinx" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Python documentation generator" -HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc latex test" - -# Portage has only >= minimum required versions of all rdeps making -# setting of version borders unnecessary -RDEPEND=" - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - latex? ( - dev-texlive/texlive-latexextra - app-text/dvipng - )" -DEPEND="${DEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile() { - distutils-r1_python_compile - - # Generate the grammar. It will be caught by install somehow. - # Note that the tests usually do it for us. However, I don't want - # to trust USE=test really running all the tests, especially - # with FEATURES=test-fail-continue. - pushd "${BUILD_DIR}"/lib > /dev/null || die - "${PYTHON}" -m sphinx.pycode.__init__ \ - || die "Grammar generation failed." - popd > /dev/null || die -} - -python_compile_all() { - use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - - if $(python_is_python3); then - 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die - fi - - nosetests -w "${BUILD_DIR}"/tests -v \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all -} - -replacing_python_eclass() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.1.3-r4 ${pv}; then - return 0 - fi - done - - return 1 -} - -pkg_preinst() { - if replacing_python_eclass; then - # the old python.eclass ebuild will want to remove our pickles... - backup_pickle() { - # array to enable filename expansion - local pickle_name=( - "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle - ) - - local dest=${ROOT}${pickle_name[0]#${D}}.backup - - eumask_push 022 - mkdir -p "${dest%/*}" || die - eumask_pop - - cp -p -v "${pickle_name[0]}" "${dest}" \ - || die "Unable to backup grammar pickle from overwriting" - } - - python_foreach_impl backup_pickle - fi -} - -pkg_postinst() { - if replacing_python_eclass; then - local warned - - restore_pickle() { - local backup_name=( - "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup - ) - local dest=${backup_name[0]%.backup} - - mv -v "${backup_name[0]}" "${dest}" \ - || die "Unable to restore grammar pickle backup" - } - - python_foreach_impl restore_pickle - - [[ ${warned} ]] && ewarn "Please try rebuilding the package." - fi -} diff --git a/dev-python/sphinx/sphinx-1.2.3.ebuild b/dev-python/sphinx/sphinx-1.2.3.ebuild index 3db64054a136..339f31fc05d5 100644 --- a/dev-python/sphinx/sphinx-1.2.3.ebuild +++ b/dev-python/sphinx/sphinx-1.2.3.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 eutils versionator diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild deleted file mode 100644 index 1d8298687dca..000000000000 --- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy) - -inherit distutils-r1 eutils versionator - -MY_PN="Sphinx" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Python documentation generator" -HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc latex test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/docutils-0.11[${PYTHON_USEDEP}] - >=dev-python/jinja-2.3[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}] - >=dev-python/six-1.4[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - =dev-python/alabaster-0.7*[${PYTHON_USEDEP}] - >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}] - latex? ( - dev-texlive/texlive-latexextra - app-text/dvipng - )" -DEPEND="${DEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) - )" -PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -python_compile() { - distutils-r1_python_compile - - # Generate the grammar. It will be caught by install somehow. - # Note that the tests usually do it for us. However, I don't want - # to trust USE=test really running all the tests, especially - # with FEATURES=test-fail-continue. - pushd "${BUILD_DIR}"/lib > /dev/null || die - "${PYTHON}" -m sphinx.pycode.__init__ \ - || die "Grammar generation failed." - popd > /dev/null || die -} - -python_compile_all() { - use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html -} - -python_test() { - mkdir -p "${BUILD_DIR}/sphinx_tempdir" - export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir" - cp -r -l tests "${BUILD_DIR}"/ || die - - if $(python_is_python3); then - 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die - fi - - nosetests -w "${BUILD_DIR}"/tests -v \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all -} - -replacing_python_eclass() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.1.3-r4 ${pv}; then - return 0 - fi - done - - return 1 -} - -pkg_preinst() { - if replacing_python_eclass; then - # the old python.eclass ebuild will want to remove our pickles... - backup_pickle() { - # array to enable filename expansion - local pickle_name=( - "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle - ) - - local dest=${ROOT}${pickle_name[0]#${D}}.backup - - eumask_push 022 - mkdir -p "${dest%/*}" || die - eumask_pop - - cp -p -v "${pickle_name[0]}" "${dest}" \ - || die "Unable to backup grammar pickle from overwriting" - } - - python_foreach_impl backup_pickle - fi -} - -pkg_postinst() { - if replacing_python_eclass; then - local warned - - restore_pickle() { - local backup_name=( - "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup - ) - local dest=${backup_name[0]%.backup} - - mv -v "${backup_name[0]}" "${dest}" \ - || die "Unable to restore grammar pickle backup" - } - - python_foreach_impl restore_pickle - - [[ ${warned} ]] && ewarn "Please try rebuilding the package." - fi -} diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild index 48c79764279e..c85460e9f893 100644 --- a/dev-python/sphinx/sphinx-1.3.1.ebuild +++ b/dev-python/sphinx/sphinx-1.3.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy) inherit distutils-r1 eutils versionator -- cgit v1.2.3-65-gdbad