From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CD84A1384C1 for ; Tue, 15 Jan 2013 21:31:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D14D21C05F; Tue, 15 Jan 2013 21:31:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE77021C05F for ; Tue, 15 Jan 2013 21:31:23 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2BDC33DABB for ; Tue, 15 Jan 2013 21:31:22 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id A49222171D; Tue, 15 Jan 2013 21:31:21 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-python/sphinx: sphinx-1.1.3-r5.ebuild ChangeLog sphinx-1.1.3-r4.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: sphinx-1.1.3-r5.ebuild ChangeLog sphinx-1.1.3-r4.ebuild X-VCS-Directories: dev-python/sphinx X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130115213121.A49222171D@flycatcher.gentoo.org> Date: Tue, 15 Jan 2013 21:31:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e3c7ef44-1431-48ad-954b-9c8d5f674574 X-Archives-Hash: 8abc8d75d1de9e3bc86278f9b7485d4c mgorny 13/01/15 21:31:21 Modified: ChangeLog Added: sphinx-1.1.3-r5.ebuild Removed: sphinx-1.1.3-r4.ebuild Log: Make sure to always generate and install Grammar pickles. Work-around the older ebuild's postrm() removing it. (Portage version: 2.2.0_alpha152/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) Revision Changes Path 1.123 dev-python/sphinx/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.123&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?rev=1.123&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/ChangeLog?r1=1.122&r2=1.123 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- ChangeLog 14 Jan 2013 00:03:38 -0000 1.122 +++ ChangeLog 15 Jan 2013 21:31:21 -0000 1.123 @@ -1,6 +1,13 @@ # ChangeLog for dev-python/sphinx # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.122 2013/01/14 00:03:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.123 2013/01/15 21:31:21 mgorny Exp $ + +*sphinx-1.1.3-r5 (15 Jan 2013) + + 15 Jan 2013; Michał Górny +sphinx-1.1.3-r5.ebuild, + -sphinx-1.1.3-r4.ebuild: + Make sure to always generate and install Grammar pickles. Work-around the + older ebuild's postrm() removing it. *sphinx-1.1.3-r4 (14 Jan 2013) 1.1 dev-python/sphinx/sphinx-1.1.3-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r5.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r5.ebuild?rev=1.1&content-type=text/plain Index: sphinx-1.1.3-r5.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r5.ebuild,v 1.1 2013/01/15 21:31:21 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy1_9 ) inherit distutils-r1 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc latex test" RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}] >=dev-python/jinja-2.3[${PYTHON_USEDEP}] >=dev-python/pygments-1.2[${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}" PATCHES=( "${FILESDIR}"/${P}-python3.patch ) python_compile() { distutils-r1_python_compile if use test; then cp -r -l tests "${BUILD_DIR}"/lib || die if [[ ${EPYTHON} == python3* ]]; then 2to3 -w --no-diffs "${BUILD_DIR}"/lib/tests || die fi fi # Generate the grammar. It will be catched 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. cd "${BUILD_DIR}"/lib || die "${PYTHON}" -m sphinx.pycode.__init__ \ || die "Grammar generation failed." } python_compile_all() { use doc && emake -C doc SPHINXBUILD="${PYTHON} -m sphinx.__init__" html } python_test() { nosetests -w "${BUILD_DIR}"/lib/tests || ewarn "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 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 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 fi }