revbump; correction to deps noted by Arfrever

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index d2e61ab8cb5157341df4aabe5c5005a724930327..3ffcf65e26a67ea93a9c1672614624621969170a 100644 (file)
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.187 2015/03/28 07:02:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.188 2015/04/02 09:56:15 idella4 Exp $
+
+*sphinx-1.3-r1 (02 Apr 2015)
+
+  02 Apr 2015; Ian Delaney <idella4@gentoo.org> +sphinx-1.3-r1.ebuild:
+  revbump; correction to deps noted by Arfrever
 
   28 Mar 2015; Markus Meier <maekke@gentoo.org> sphinx-1.3.ebuild:
   add ~arm, bug #543742

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index b57f22439e1508920f8d8050d6f640f6c2fcff30..964618ed937c72397d9822b0fa51aefa9f9e8281 100644 (file)
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -10,13 +10,14 @@ DIST Sphinx-1.3.tar.gz 3465600 SHA256 8bbe269ecbc6d19c45974b99f9e38afd2545103974
 EBUILD sphinx-1.1.3-r7.ebuild 3187 SHA256 8fbd49b4dab19c1373411728c12859c88f1f79e3fcec69391505e0ba4aefa9b1 SHA512 e1fb843906ebefceaa7608c3a160da3e75883a6117ab70ca32562128226a807da209f881f5534e6fec5690320ac5311b9f00183c08608e6eaa887fbcf9623f89 WHIRLPOOL 9703a43357b9443b0642a19b55f6c78a8af63ccc54db6120d107c1bda555b6aaa0858615c6a5e817ba93faf2bfa7ff3bdc81cf7337387e2baed0f58bdfb3b60d
 EBUILD sphinx-1.2.2.ebuild 3139 SHA256 fee9616b3da4d18d946e98330664fd8f2d102b535313d71fcf436c0040aa0db3 SHA512 e827bf8086b1470861838cc7f789e3ec707ff19932ca284f126f18973cec56ef6996783c5f72ecebe18f587594f28418562c050eb6cb1200cae0e4a786600950 WHIRLPOOL 9776509476cab74c9811ae42e6ea2bb53b4b11e81a2ec65e183d67ccc4283ad3787b2f9862bd0910af0f1a2a9a4638978732752795de8dcce4ad5e3b5a96f8f5
 EBUILD sphinx-1.2.3.ebuild 3191 SHA256 7be3e9ebb5e137f8cd90693f1f57f75c43ad0e8038799e56fb2dc96a48e9d860 SHA512 2c0d4d42c94b5bf7dd39d04192196a22b90ea7779598030873a91a718c16dfdd1062d7d7ae372c169ac0c96eba3e5f4e3a0baa5a5c0c36f1c2d2583b18d8efd6 WHIRLPOOL 2b3cbbda45c7bbc94eaa5274d837fc28839d9fd0c2df829425062803b45fb314072545ccab05cda0b770575f288abd77aa6c748e8e749b51db8b03786d31b764
+EBUILD sphinx-1.3-r1.ebuild 3358 SHA256 ea2742a8288d85844d4f50bf01a91995f82de0caa1940b999254b8d37e5f7c36 SHA512 43a61127448aa1bf8665c23c94e67cc9f883b140f9a6d18cc47bf6e54e250f0a1b81aa43e559884128f0117e3df55f0ebdbf6ccb0155ee7f75e572a0c59754d5 WHIRLPOOL 1ecf27f7ea08d3a9b36ec8a73698196b83e2718ea571b0c22b2388bc57a039650d526e47f5d17c000f4a392446d974751b812e01e2bbd31e0ea8f3d25137a278
 EBUILD sphinx-1.3.ebuild 3376 SHA256 1bfe1fb84c560b62579b24f507c1c5e169867fab356775f1b20a292f8ffea874 SHA512 78cbf46a9ebb158f47d5ac11147e140699354416e804f62c970037a9ad2784cdbdcdfa6c60dd6f98943fdbba511da08560972863333a1f36e4f6593075d44671 WHIRLPOOL 1264c6f45be300e553a83a02d9535c515d7f5afe48dcb4055b72eba7b70d3299ee8cbf2ad7cf14dec7c358b9412514e844d1f71701fb94e1d74286ffcdf702c8
-MISC ChangeLog 22945 SHA256 9d31ceaea39f481a97d5d9ca22f0284fd8d49ac00462ede8fcad04d1eb76ecc3 SHA512 104b6b9b4176c45a1260eb3d428592f14daa6a62c949e192e61b214de6e067b6a88d1d41a2a223c2c2ddbdb162ab549b18280c113a0a483c5097c5f2150f14be WHIRLPOOL c94819c0025e5b8341c5b90040d0f084b10de25de9372a92eec7117915f0dee79bcbac371e80cdeaed34730cbc1875904313e2f3c920478ea8e06097b75b5765
+MISC ChangeLog 23096 SHA256 cfce23cb11228f80cf813df33577d74d13c97eb94f070ba155b461a1e5b865fc SHA512 764a785bc44e1539e0db05a7ead90a31825c34bf00abd67e2b432773eaf08382e9159a4b4a3ac5b333a0301142d8ce91038d66aacdb572b5da7a872cfa526689 WHIRLPOOL 17523ab08ffd18b69b7857c0ea551e56b77e2174dc32507a8fcedf84455d96988db7beb30c7ab663cd5bf3d5ad3cb66fc8bedd547f7f5c566b37d25cf9479818
 MISC metadata.xml 416 SHA256 9e9417fe86b8082263e371d1e92b98adf3ac73ed04ca0d97870423eee7110639 SHA512 68e3d7d3037dd4e2f36ff419507fe1cbe3822ab67d4e5ba9e76274d9db9ccac15d0f5479095d76758e2bc8d915493dd968742034d75ae9608ba6c88bb0db2a98 WHIRLPOOL cf811b4461bd1b39c249c82e0ce36ecdc721816fb10baca4f8f249b9bbac7908c1ec42be683850d34c099643d6d0e3a8e18969f2be12468993c8cd553177d6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUWUe4ACgkQkKaRLQcq0GIHcACfSUl6kgeyG5bp0wDa9G8Km7g4
-1vMAn30lv8kPX1QwxWhRiiohWTX8FQ+U
-=WQEN
+iEYEAREIAAYFAlUdEk4ACgkQso7CE7gHKw3lhwCcD109oh19XnciM7Kav2oT6bYD
+W54AoIKR2daHDhe8rQ52lc+sFtFcbdch
+=BdA1
 -----END PGP SIGNATURE-----

diff --git a/dev-python/sphinx/sphinx-1.3-r1.ebuild b/dev-python/sphinx/sphinx-1.3-r1.ebuild
new file mode 100644 (file)
index 0000000..122a6c6
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.3-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.3-r1.ebuild,v 1.1 2015/04/02 09:56:15 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ http://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 ~arm ~hppa ~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[${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/sphinx_rtd_theme-0.1*[${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) )"
+
+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
+}