public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-python/networkx: networkx-1.7-r2.ebuild ChangeLog
@ 2013-08-18 10:33 Michal Gorny (mgorny)
  0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-18 10:33 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/08/18 10:33:24

  Modified:             networkx-1.7-r2.ebuild ChangeLog
  Log:
  Improve the distutils-r1 ebuild. Install docs into /usr/share/doc/${PF}.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

Revision  Changes    Path
1.2                  dev-python/networkx/networkx-1.7-r2.ebuild

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

Index: networkx-1.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkx-1.7-r2.ebuild	26 Apr 2013 09:50:14 -0000	1.1
+++ networkx-1.7-r2.ebuild	18 Aug 2013 10:33:24 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.1 2013/04/26 09:50:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.2 2013/08/18 10:33:24 mgorny Exp $
 
 EAPI=5
 
@@ -36,28 +36,23 @@
 		virtual/pyparsing[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
-	 )"
+	)"
 
 python_compile_all() {
 	if use doc; then
-		elog "Building docs"
-		# PYTHONPATH is necessary to use networkx to be installed.
-		cd "${S}"/doc || die
 		sed \
 			-e "s:^\t\./:\t${PYTHON} :g" \
-			-i Makefile || die
-		pwd
-		PYTHONPATH="${S}:${PYTHONPATH}" make html \
-			|| die "doc compilation failed"
+			-i doc/Makefile || die
+		emake -C doc html
 	fi
 }
 
 python_install_all() {
-	distutils-r1_python_install_all
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
 
-	rm -f "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE}.txt || die
-	if ! use examples; then
-		rm -r "${ED}"usr/share/doc/${P}/examples || die
-	fi
-	use doc && dohtml -r doc/build/html/*
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
 }



1.18                 dev-python/networkx/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	26 Apr 2013 09:50:14 -0000	1.17
+++ ChangeLog	18 Aug 2013 10:33:24 -0000	1.18
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/networkx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.17 2013/04/26 09:50:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.18 2013/08/18 10:33:24 mgorny Exp $
+
+  18 Aug 2013; Michał Górny <mgorny@gentoo.org> networkx-1.7-r2.ebuild:
+  Improve the distutils-r1 ebuild. Install docs into /usr/share/doc/${PF}.
 
 *networkx-1.7-r2 (26 Apr 2013)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/networkx: networkx-1.7-r2.ebuild ChangeLog
@ 2013-08-18 10:38 Michal Gorny (mgorny)
  0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-18 10:38 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/08/18 10:38:07

  Modified:             networkx-1.7-r2.ebuild ChangeLog
  Log:
  Add the test phase.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

Revision  Changes    Path
1.3                  dev-python/networkx/networkx-1.7-r2.ebuild

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

Index: networkx-1.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- networkx-1.7-r2.ebuild	18 Aug 2013 10:33:24 -0000	1.2
+++ networkx-1.7-r2.ebuild	18 Aug 2013 10:38:07 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.2 2013/08/18 10:33:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.3 2013/08/18 10:38:07 mgorny Exp $
 
 EAPI=5
 
@@ -47,6 +47,10 @@
 	fi
 }
 
+python_test() {
+	nosetests || die
+}
+
 python_install_all() {
 	# Oh my.
 	rm -r "${ED}"usr/share/doc/${P} || die



1.19                 dev-python/networkx/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	18 Aug 2013 10:33:24 -0000	1.18
+++ ChangeLog	18 Aug 2013 10:38:07 -0000	1.19
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/networkx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.18 2013/08/18 10:33:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.19 2013/08/18 10:38:07 mgorny Exp $
+
+  18 Aug 2013; Michał Górny <mgorny@gentoo.org> networkx-1.7-r2.ebuild:
+  Add the test phase.
 
   18 Aug 2013; Michał Górny <mgorny@gentoo.org> networkx-1.7-r2.ebuild:
   Improve the distutils-r1 ebuild. Install docs into /usr/share/doc/${PF}.





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-08-18 10:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-18 10:38 [gentoo-commits] gentoo-x86 commit in dev-python/networkx: networkx-1.7-r2.ebuild ChangeLog Michal Gorny (mgorny)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-18 10:33 Michal Gorny (mgorny)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox