diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-10-20 03:10:14 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-10-20 03:10:14 +0000 |
| commit | 18d6c2c0d4510113e6ec8cd001d1d00c6e7c0104 (patch) | |
| tree | 2ba6c1300b356ca5d73d2944c66e869ebb912455 /dev-python/psycopg | |
| parent | Add phonon to kde required use to fix build failure #523668 (diff) | |
| download | gentoo-2-18d6c2c0d4510113e6ec8cd001d1d00c6e7c0104.tar.gz gentoo-2-18d6c2c0d4510113e6ec8cd001d1d00c6e7c0104.tar.bz2 gentoo-2-18d6c2c0d4510113e6ec8cd001d1d00c6e7c0104.zip | |
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)
Diffstat (limited to 'dev-python/psycopg')
| -rw-r--r-- | dev-python/psycopg/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/psycopg/files/2.5.4-docbuild.patch | 11 | ||||
| -rw-r--r-- | dev-python/psycopg/psycopg-2.5.4.ebuild | 9 |
3 files changed, 11 insertions, 16 deletions
diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog index 8a9ada6cfe69..1e2eecffc45f 100644 --- a/dev-python/psycopg/ChangeLog +++ b/dev-python/psycopg/ChangeLog @@ -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 <idella4@gentoo.org> -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 <idella4@gentoo.org> psycopg-2.5.4.ebuild: add python-docs dep for doc build diff --git a/dev-python/psycopg/files/2.5.4-docbuild.patch b/dev-python/psycopg/files/2.5.4-docbuild.patch deleted file mode 100644 index fc1cd6ec10e1..000000000000 --- a/dev-python/psycopg/files/2.5.4-docbuild.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur psycopg2-2.5.4.orig/doc/src/conf.py psycopg2-2.5.4/doc/src/conf.py ---- doc/src/conf.py 2014-08-31 01:55:25.000000000 +0800 -+++ doc/src/conf.py 2014-10-17 23:15:38.907243293 +0800 -@@ -64,7 +64,6 @@ - - intersphinx_mapping = { - 'py': ('http://docs.python.org/', None), -- 'py3': ('http://docs.python.org/3.2', None), - } - - # Pattern to generate links to the bug tracker diff --git a/dev-python/psycopg/psycopg-2.5.4.ebuild b/dev-python/psycopg/psycopg-2.5.4.ebuild index 03389174159f..a587d2e9969b 100644 --- a/dev-python/psycopg/psycopg-2.5.4.ebuild +++ b/dev-python/psycopg/psycopg-2.5.4.ebuild @@ -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 @@ DEPEND="${RDEPEND} 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 @@ python_prepare_all() { 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 |