[gentoo-commits] gentoo-x86 commit in dev-python/routes: ChangeLog routes-1.11.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    10/01/02 23:33:12

  Modified:             ChangeLog routes-1.11.ebuild
  Log:
  Use documentation already present in the tarball instead of generating it
  in src_compile() to fix building wiht USE="doc" (bug #297795).
  (Portage version: 15156-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  dev-python/routes/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/routes/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/routes/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/routes/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog	20 Dec 2009 10:31:25 -0000	1.8
+++ ChangeLog	2 Jan 2010 23:33:12 -0000	1.9
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/routes
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v 1.8 2009/12/20 10:31:25 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v 1.9 2010/01/02 23:33:12 arfrever Exp $
+
+  02 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  routes-1.11.ebuild:
+  Use documentation already present in the tarball instead of generating it
+  in src_compile() to fix building wiht USE="doc" (bug #297795).
 
   20 Dec 2009; Fabian Groffen <grobian@g.o> routes-1.11.ebuild:
   Merged keywords from Prefix overlay



1.3                  dev-python/routes/routes-1.11.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/routes/routes-1.11.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/routes/routes-1.11.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/routes/routes-1.11.ebuild?r1=1.2&r2=1.3

Index: routes-1.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/routes/routes-1.11.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- routes-1.11.ebuild	20 Dec 2009 10:31:25 -0000	1.2
+++ routes-1.11.ebuild	2 Jan 2010 23:33:12 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-1.11.ebuild,v 1.2 2009/12/20 10:31:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-1.11.ebuild,v 1.3 2010/01/02 23:33:12 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,21 +20,12 @@
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools
-	doc? ( dev-python/buildutils dev-python/pudge )
 	test? ( dev-python/coverage dev-python/nose )"
 RDEPEND=""
 RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		PYTHONPATH=. "${python}" setup.py pudge || die "Generation of documentation failed"
-	fi
-}
-
 src_test() {
 	testing() {
 		PYTHONPATH="build-${PYTHON_ABI}" nosetests-${PYTHON_ABI}
@@ -44,5 +35,8 @@
 
 src_install() {
 	distutils_src_install
-	use doc && dohtml -r docs/html/*
+
+	if use doc; then
+		dohtml -r docs/_build/html/* || die "dohtml failed"
+	fi
 }