From 6a7c2729315eab6eeb534518b75567cda2dedcdb Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Thu, 19 Mar 2015 02:36:41 +0000 Subject: [PATCH] Bump, new test deps, temporarily dropped keywords until dependencies catch up Package-Manager: portage-2.2.18/cvs/Linux x86_64 --- dev-python/sphinx/ChangeLog | 7 +- dev-python/sphinx/Manifest | 24 +---- dev-python/sphinx/sphinx-1.3.ebuild | 133 ++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 22 deletions(-) create mode 100644 dev-python/sphinx/sphinx-1.3.ebuild diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog index b80e6754ce42..af8038c3e27a 100644 --- 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.183 2015/03/03 07:22:40 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.184 2015/03/19 02:36:29 patrick Exp $ + +*sphinx-1.3 (19 Mar 2015) + + 19 Mar 2015; Patrick Lauer +sphinx-1.3.ebuild: + Bump, new test deps, temporarily dropped keywords until dependencies catch up 02 Mar 2015; Yixun Lan sphinx-1.2.3.ebuild: add arm64 support, tested on A53 board diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest index 4d8ced394659..d10f0765dd28 100644 --- a/dev-python/sphinx/Manifest +++ b/dev-python/sphinx/Manifest @@ -1,30 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX sphinx-1.1.3-docutils-manpage.patch 1310 SHA256 97d29af271a833188245399912fb459c4182262138411f9f745821493507977f SHA512 340340215c5549aa3d59afbfacfef9e5b08a5d22700bd8d2391edd38960c5a5f4db95abe2c052f01fd4873852ce2dbe485f9a87f0f2fc8689fe8b3f1fa064521 WHIRLPOOL 9d50448b9c7fbd7cc95e4675df2f2be79b15c654d82f7f0740ff7ca3881e4227005eedc0ad7bd6a12548c71fefd06479a5cec1d255e089c0cb39fa9ae53257b9 AUX sphinx-1.1.3-python3.patch 1793 SHA256 f21f0f4f8b1f83660344b7b8c1512f853d579eb2938e7f6b4305008252824f46 SHA512 c7970403bc8f6d329a5e9c5abf0ad0a7465f1249706f5ca7cffbc374c5214c14903b524c415df8bd14cb7c2f080a19c96ddbba77f7fc8ce0a699b36005fdbb36 WHIRLPOOL a7f69a5da9f258ac583a86046547362c1c3547187f4074eaec4b605b6a09ca9a070f4257a3cb6ae2cd2fbc3a33c4e893c313741625cee3f482b5b52dd8116466 DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 SHA512 b8312140d752bf557c8e41728513812aff3e5d0a89af88dea9da0df21bf09c8315f13305d7a724a5596d0192b167d613065ea564c6d92e4ffb23f1f246dbf052 WHIRLPOOL a40c4d0f5c32cf1d4b9b662b0fb2b2b0956e0455abbc88d6b5f95c54f93cc2baae25e8b9196dd0b64090d30a1a796c336ca4b6866243be4198ccdf67a7e18b48 DIST Sphinx-1.2.2.tar.gz 3143671 SHA256 2d3415f5b3e6b7535877f4c84fe228bdb802a8993c239b2d02c23169d67349bd SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c WHIRLPOOL c5ed15b51682d3be9f8349ab838c6758cb4e25023b6ad13622d748b771594ed75f786709a25fb2d61ad245ecef0925e5bcc1aafb93fc355a0f0ea50df63efcd7 DIST Sphinx-1.2.3.tar.gz 3200548 SHA256 94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04 SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05 WHIRLPOOL 0c0e2e21a52829893857939f977e8312c4eac11f5d2aec3b8e4f9c8ffdbf14c4aa46a6c26dac0ad4abfe92b3bdad72a3468e6d2ff2485df6efaf3fccd17ae69b +DIST Sphinx-1.3.tar.gz 3465600 SHA256 8bbe269ecbc6d19c45974b99f9e38afd2545103974cf54a1330fd3314ab5fea4 SHA512 94df299b5a0ddc7bb092641e0bb00a8491fe2a7468728a26468feb31ad9002d94d9696f370546dee961dc7ac4167bf8204f2b3a5e4a0d79beff27b87a64fea05 WHIRLPOOL 446abad493d4ade13702261594e0ba0f336f6bba007c56a7f8c431386511e4488a3dfd2f32ee7f95292b2f233039be1dedc92a7485a284820c4a2ab6620c90b6 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 -MISC ChangeLog 22544 SHA256 9f5dd70efbe7370cab7dee87f9d417e1cc96acc359478aeff03b33cbb9ff8ce9 SHA512 569efad99c2d6bdca0220bdefb4420c16ca890fd895fdba86e2eeba2ebaf9683369b139faadf228be7573ad43a12ac681ff2d0f8869fb3ab1e4148c7047e537b WHIRLPOOL af08f61f159cbf297147f04ec5873e0452eba006d9d634b2bca443268b972077494cfdbcd27db11577a2d850258eb56edbe733ad3cfb908704be501eeda661e4 +EBUILD sphinx-1.3.ebuild 3366 SHA256 d1b15fe503ef7bf88e862df20e4e1a6dfe17b3227ba4be6315c5a2789dc7327a SHA512 50af33143ac92c9c06ae724ade987ead6836264ec24e55bc9167e62960d412244bd93ea4a98166e00fde222015cbbfe31770fffa0a1ba6c24dd741ae33062427 WHIRLPOOL 84112d44e4bd9df31be8186e323a4e281eb40c8cc58ee2944a16e2b674c8cfee596330aca3d6344b6fe657c478b7914d5d0911e7c4003b760c3e02b57bf334bc +MISC ChangeLog 22725 SHA256 734155d68e5f19c67cf54f0eba5bc19aa358660310f1dc74f424c8b52f195211 SHA512 3b977e80336b45600e948831c9d3817c90321bdb1b7bbbb5cc185dc8db41d952109b827abf60349ce1d70cb3380fc81c652145efb51490f776fa4884f47ae85e WHIRLPOOL 568fe956e93f446c9fcd16f23c44cc25cd9548094d723897f3881cbd607c601bfcd9944728cc0c0bb01097cac85817eed8c6bd090b9231ae1f4c698d9eb3fd60 MISC metadata.xml 416 SHA256 9e9417fe86b8082263e371d1e92b98adf3ac73ed04ca0d97870423eee7110639 SHA512 68e3d7d3037dd4e2f36ff419507fe1cbe3822ab67d4e5ba9e76274d9db9ccac15d0f5479095d76758e2bc8d915493dd968742034d75ae9608ba6c88bb0db2a98 WHIRLPOOL cf811b4461bd1b39c249c82e0ce36ecdc721816fb10baca4f8f249b9bbac7908c1ec42be683850d34c099643d6d0e3a8e18969f2be12468993c8cd553177d6c2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU9PBkAAoJEJIMDbyqvv1VNioQAJ2zV0kFWxxSnI8WhvYDd7mZ -8eeAKCmLgD6Oxm5MgXfITFRGdTOFPCpr8QSNUyW5GuTBSsnr+jdFkgj8ixUsEE6R -NMRCQn45yQnEvPmiTi/GNMf0FNSu08SV7ed9uKHiR8Cs+Wpx/DVwFif+/a/F5YIB -VjHdRRudAKlvRPoiyAFm0nS0GGufgHuvL/IeIFPllVkRqnJImeZoBJmwytmv/Mgz -6qFbgdFdsaBU29VwyJB4yKwivu6XnCCEQ2auruS1jCmlHUsJ5ap7a7ZqTTX0YQ8h -jFE1HdcP6lrXAcC7vG2cphZY1zdXs2yqhO+63FvbeJhGtyvQNE3tQFoq1dK44J5j -DCWN1q6Dy5mYEQIy694wcdmxeTGjUS1vaDAQ+/RXlSQzbP+shWHM933xlLHVGuqd -xrsUYd9SVyyZ44FFXGY7L1CgHpyl8GDu1g4LGEF+U10tcmLm2Fsy2v3O6Bph6kA6 -jYqLKwpdysddlpXHWrHrIg9PpjcWtFJE9Qcx0+PaX++/xD+xAaHIXXYX4Ae7QvNu -XrtXNos2Vvdb9qM8+ME1cr3YWYukpQSVyIBUC990sAf5yNmpO7eNEpafUi7GTgYr -/TBeAYWrx/kcCoUPm8S9skhOOXVOB/lUum/JulXAglb93+VYdqo6hE7hxIvw0IMX -0cPJStaH3+UbA8Ci0QBG -=cy6n ------END PGP SIGNATURE----- diff --git a/dev-python/sphinx/sphinx-1.3.ebuild b/dev-python/sphinx/sphinx-1.3.ebuild new file mode 100644 index 000000000000..c313afd79725 --- /dev/null +++ b/dev-python/sphinx/sphinx-1.3.ebuild @@ -0,0 +1,133 @@ +# 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.ebuild,v 1.1 2015/03/19 02:36:29 patrick 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 ~x86" +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}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/Babel[${PYTHON_USEDEP}] + dev-python/alabaster[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + dev-python/snowballstemmer[${PYTHON_USEDEP}] + latex? ( + dev-texlive/texlive-latexextra + app-text/dvipng + )" +DEPEND="${DEPEND} + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/mock[${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 +} -- 2.26.2