bump; drop py2.6, patch to remove py3.2's objects.inv from doc build, upgrade doc build and install

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 91 insertions, 6 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index f1c0a8d79c3b..926c62dad5a4 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.174 2014/05/26 08:43:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.175 2014/10/17 16:47:06 idella4 Exp $
+
+*psycopg-2.5.4 (17 Oct 2014)
+
+  17 Oct 2014; Ian Delaney <idella4@gentoo.org> +files/2.5.4-docbuild.patch,
+  +psycopg-2.5.4.ebuild, psycopg-2.5.3.ebuild:
+  bump; drop py2.6, patch to remove py3.2's objects.inv from doc build, upgrade
+  doc build and install
 
 *psycopg-2.5.3 (26 May 2014)
 
diff --git a/dev-python/psycopg/files/2.5.4-docbuild.patch b/dev-python/psycopg/files/2.5.4-docbuild.patch
new file mode 100644
index 000000000000..fc1cd6ec10e1
--- /dev/null
+++ b/dev-python/psycopg/files/2.5.4-docbuild.patch
@@ -0,0 +1,11 @@
+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.3.ebuild b/dev-python/psycopg/psycopg-2.5.3.ebuild
index 5e8edb36b6de..0d3aa3dea453 100644
--- a/dev-python/psycopg/psycopg-2.5.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.5.3.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.3.ebuild,v 1.1 2014/05/26 08:43:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.3.ebuild,v 1.2 2014/10/17 16:47:06 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -44,10 +44,6 @@ python_prepare_all() {
 		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
 	fi
 
-#	if use mxdatetime; then
-#		sed -i 's/\(use_pydatetime=\)1/\10/' setup.cfg || die
-#	fi
-
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/psycopg/psycopg-2.5.4.ebuild b/dev-python/psycopg/psycopg-2.5.4.ebuild
new file mode 100644
index 000000000000..e35c239558d2
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.5.4.ebuild
@@ -0,0 +1,71 @@
+# 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.1 2014/10/17 16:47:06 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-base-8.1"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+# Remove py3.2 entry from intersphinx setting
+PATCHES=( "${FILESDIR}/"${PN}-2.4.2-setup.py.patch
+		"${FILESDIR}/"${PV}-docbuild.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	# Source local copy of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		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
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc doc/psycopg2.txt
+		dohtml -r doc/html/.
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}