rev bumped, doc use flag added, tests restricted for python3 due to known failures, epydoc dep added to build docs, test phase updated

(Portage version: 2.1.11.30/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 44 insertions, 9 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index a41687c2686a..f69ef0013417 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.103 2012/08/27 15:21:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.104 2012/11/05 17:48:10 idella4 Exp $
+
+*logilab-common-0.58.1-r1 (06 Nov 2012)
+
+  06 Nov 2012; Ian Delaney <idella4@gentoo.org>
+  +logilab-common-0.58.1-r1.ebuild, -logilab-common-0.55.2.ebuild,
+  logilab-common-0.58.1.ebuild:
+  rev bumped, doc use flag added, tests restricted for python3 due to known
+  failures, epydoc dep added to build docs, test phase updated
 
   27 Aug 2012; Mike Gilbert <floppym@gentoo.org> logilab-common-0.55.2.ebuild,
   logilab-common-0.57.1.ebuild, logilab-common-0.57.2.ebuild,
diff --git a/dev-python/logilab-common/logilab-common-0.55.2.ebuild b/dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild
index 70dab4b66dbc..0478428f69e1 100644
--- a/dev-python/logilab-common/logilab-common-0.55.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.55.2.ebuild,v 1.5 2012/08/27 15:21:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild,v 1.1 2012/11/05 17:48:10 idella4 Exp $
 
-EAPI="3"
+EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
+# Current tally of 8 test failures for python3
+#PYTHON_TESTS_RESTRICTED_ABIS="3.*"
 
 inherit distutils
 
@@ -13,21 +15,43 @@ SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test doc"
 
 # dev-python/unittest2 is not required with Python >=3.2.
 RDEPEND="dev-python/setuptools
 	dev-python/unittest2"
+
 # Tests using dev-python/psycopg are skipped when dev-python/psycopg isn't installed.
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/egenix-mx-base
 		!dev-python/psycopg[-mxdatetime]
-	)"
+	)
+	doc? ( dev-python/epydoc )"
 
 PYTHON_MODNAME="logilab"
 
+src_prepare() {
+	if use doc; then
+		sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
+	fi
+	distutils_src_prepare
+}
+
+src_compile() {
+	distutils_src_compile
+
+	# Simplest way to make makefile point to the right place.
+	mklinks() {
+		# dosym it seems is restricted to src_install.
+		ln -s build-${PYTHON_ABI} build
+		emake -C doc epydoc
+		rm build
+	}
+	use doc && python_execute_function -f mklinks
+}
+
 src_test() {
 	testing() {
 		# Install temporarily.
@@ -40,9 +64,9 @@ src_test() {
 		pushd "${spath}" > /dev/null || return 1
 		if [[ "${PYTHON_ABI}" == 3.* ]]; then
 			# Support for Python 3 is experimental. Some tests are known to fail.
-			PYTHONPATH="${spath}" "$(PYTHON)" "${tpath}${EPREFIX}/usr/bin/pytest" -v
+			PYTHONPATH=.:/logilab/common/test "${tpath}${EPREFIX}/usr/bin/pytest" -v || return 1
 		else
-			PYTHONPATH="${spath}" "$(PYTHON)" "${tpath}${EPREFIX}/usr/bin/pytest" -v || return 1
+			PYTHONPATH="${spath}" "${tpath}${EPREFIX}/usr/bin/pytest" -v || return 1
 		fi
 		popd > /dev/null || return 1
 	}
@@ -59,5 +83,7 @@ src_install() {
 	delete_tests() {
 		rm -fr "${ED}$(python_get_sitedir)/${PN/-//}/test"
 	}
+
+	use doc && dohtml -r doc/apidoc/
 	python_execute_function -q delete_tests
 }
diff --git a/dev-python/logilab-common/logilab-common-0.58.1.ebuild b/dev-python/logilab-common/logilab-common-0.58.1.ebuild
index 3f24272f2b16..1a015ed87834 100644
--- a/dev-python/logilab-common/logilab-common-0.58.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.58.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.58.1.ebuild,v 1.2 2012/08/27 15:21:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.58.1.ebuild,v 1.3 2012/11/05 17:48:10 idella4 Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,6 +19,7 @@ IUSE="test"
 # dev-python/unittest2 is not required with Python >=3.2.
 RDEPEND="dev-python/setuptools
 	dev-python/unittest2"
+
 # Tests using dev-python/psycopg are skipped when dev-python/psycopg isn't installed.
 DEPEND="${RDEPEND}
 	test? (