idella4 14/10/20 03:10:14 Modified: psycopg-2.5.4.ebuild ChangeLog Log: remove patch, substituted with entry in sed statement (as initially intended) wrt the doc build, fixes Bug 525732 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.3 dev-python/psycopg/psycopg-2.5.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/psycopg/psycopg-2.5.4.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/psycopg/psycopg-2.5.4.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/psycopg/psycopg-2.5.4.ebuild?r1=1.2&r2=1.3 Index: psycopg-2.5.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.4.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- psycopg-2.5.4.ebuild 18 Oct 2014 13:34:53 -0000 1.2 +++ psycopg-2.5.4.ebuild 20 Oct 2014 03:10:14 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.4.ebuild,v 1.2 2014/10/18 13:34:53 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.4.ebuild,v 1.3 2014/10/20 03:10:14 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) @@ -26,8 +26,7 @@ RESTRICT="test" # Remove py3.2 entry from intersphinx setting -PATCHES=( "${FILESDIR}/"${PN}-2.4.2-setup.py.patch - "${FILESDIR}/"${PV}-docbuild.patch ) +PATCHES=( "${FILESDIR}/"${PN}-2.4.2-setup.py.patch ) S="${WORKDIR}/${MY_P}" @@ -50,7 +49,9 @@ local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed -i "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" doc/src/conf.py || die + sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \ + -e "/^ 'py3':/d" -i doc/src/conf.py || die + einfo "conf.py patched" fi distutils-r1_python_prepare_all 1.177 dev-python/psycopg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/psycopg/ChangeLog?rev=1.177&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/psycopg/ChangeLog?rev=1.177&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/psycopg/ChangeLog?r1=1.176&r2=1.177 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- ChangeLog 18 Oct 2014 13:34:53 -0000 1.176 +++ ChangeLog 20 Oct 2014 03:10:14 -0000 1.177 @@ -1,6 +1,11 @@ # ChangeLog for dev-python/psycopg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.176 2014/10/18 13:34:53 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.177 2014/10/20 03:10:14 idella4 Exp $ + + 20 Oct 2014; Ian Delaney <[email protected]> -files/2.5.4-docbuild.patch, + psycopg-2.5.4.ebuild: + remove patch, substituted with entry in sed statement (as initially intended) + wrt the doc build, fixes Bug 525732 18 Oct 2014; Ian Delaney <[email protected]> psycopg-2.5.4.ebuild: add python-docs dep for doc build
