[gentoo-commits] gentoo-x86 commit in dev-python/testfixtures: testfixtures-3.0.0.ebuild ChangeLog testfixtures-2.3.4.ebuild

[gentoo-commits] gentoo-x86 commit in dev-python/testfixtures: testfixtures-3.0.0.ebuild ChangeLog testfixtures-2.3.4.ebuild

[Ian Delaney (idella4)]

idella4     14/06/30 08:18:54

  Modified:             testfixtures-3.0.0.ebuild ChangeLog
  Removed:              testfixtures-2.3.4.ebuild
  Log:
  drop py2.6, update deps, docbuild (includes new patch), remove old ebuild and patch, fixes bug #515752 by Patrick
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.4                  dev-python/testfixtures/testfixtures-3.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild?r1=1.3&r2=1.4

Index: testfixtures-3.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testfixtures-3.0.0.ebuild	19 Mar 2014 23:10:07 -0000	1.3
+++ testfixtures-3.0.0.ebuild	30 Jun 2014 08:18:54 -0000	1.4
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.3 2014/03/19 23:10:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.4 2014/06/30 08:18:54 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 inherit distutils-r1
 
@@ -16,18 +16,19 @@
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7) )
 	test? ( dev-python/manuel[${PYTHON_USEDEP}] )"
 
-src_prepare() {
-	sed -e s':../bin/sphinx-build:/usr/bin/sphinx-build:' \
-		-i docs/Makefile || die
+# Prevent un-needed download during build, fix Makefile for doc build
+PATCHES=( "${FILESDIR}"/docbuild.patch )
 
+python_prepare() {
 	# remove test that tests the stripped zope-component test_components.ComponentsTests
 	rm -f testfixtures/tests/test_components.py || die
-	distutils-r1_src_prepare
+
+	distutils-r1_python_prepare
 }
 
 python_compile_all() {
@@ -39,7 +40,6 @@
 }
 
 python_install_all() {
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
 }



1.8                  dev-python/testfixtures/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/testfixtures/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/testfixtures/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/testfixtures/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/testfixtures/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	19 Mar 2014 23:10:07 -0000	1.7
+++ ChangeLog	30 Jun 2014 08:18:54 -0000	1.8
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/testfixtures
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/ChangeLog,v 1.7 2014/03/19 23:10:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/ChangeLog,v 1.8 2014/06/30 08:18:54 idella4 Exp $
+
+  30 Jun 2014; Ian Delaney <idella4@gentoo.org> +files/docbuild.patch,
+  -files/testfixtures-2.3.4-adjust_tests.patch, -testfixtures-2.3.4.ebuild,
+  testfixtures-3.0.0.ebuild:
+  drop py2.6, update deps, docbuild (includes new patch), remove old ebuild and
+  patch, fixes bug #515752 by Patrick
 
   19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> testfixtures-3.0.0.ebuild:
   Keyword ~amd64-linux ~x86-linux