[gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/

["Nicolas Bock" <nicolasbock@gmail.com>]

commit:     dbcfe1b03723acf9c1ec636072b0e1c9a1a9ebdf
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Tue Oct  1 03:57:16 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Oct  1 03:57:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dbcfe1b0

sys-cluster/charm-6.5.1-r1: Fix docs with -j1

Docs don't build when using anything more than -j1.

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog                        |  5 ++++
 sys-cluster/charm/charm-6.5.1-r1.ebuild            | 14 +++++-----
 .../files/charm-6.5.1-fix-navmenuGenerator.patch   | 30 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index d005b5f..21f92a3 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Oct 2013; Nicolas Bock <nicolasbock@gmail.com>
+  +files/charm-6.5.1-fix-navmenuGenerator.patch, charm-6.5.1-r1.ebuild:
+  sys-cluster/charm-6.5.1-r1: Fix docs with -j1  Docs don't build when using
+  anything more than -j1.
+
   27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:
   sys-cluster/charm-6.5.1-r1: Added python dependencies  The documentation is
   built partly with python2.x scripts. I added the necessary dependencies.

diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
index d429138..9b027c8 100644
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	)"
 
 REQUIRED_USE="
-    doc? ( ${PYTHON_REQUIRED_USE} )
+	doc? ( ${PYTHON_REQUIRED_USE} )
 	cmkopt? ( !charmdebug !charmtracing )
 	charmproduction? ( !charmdebug !charmtracing )"
 
@@ -98,6 +98,7 @@ src_prepare() {
 	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
 	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
 	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
 }
 
 src_compile() {
@@ -110,10 +111,9 @@ src_compile() {
 	# make pdf/html docs
 	if use doc; then
 		python-single-r1_pkg_setup
-		python_fix_shebang ${S}/doc
+		python_fix_shebang "${S}/doc"
 		einfo "forcing ${EPYTHON}"
-		einfo "running ./build doc ${mybuildoptions}"
-		./build doc ${mybuildoptions} || die "Failed to build charm++ documentation"
+		emake -j1 -C doc/charm++
 	fi
 }
 
@@ -190,13 +190,13 @@ src_install() {
 
 	# Install pdf/html docs
 	if use doc; then
-		cd "${S}"/doc
+		cd "${S}/doc/charm++"
 		# Install pdfs.
 		insinto /usr/share/doc/${PF}/pdf
-		doins  doc/pdf/*
+		doins  *.pdf
 		# Install html.
 		docinto html
-		dohtml -r doc/html/*
+		dohtml -r manual/*
 	fi
 }
 

diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch b/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch
new file mode 100644
index 0000000..a19a8db
--- /dev/null
+++ b/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch
@@ -0,0 +1,30 @@
+From 8b699f6c49df26b979da397b47c7dc7a099ed6b6 Mon Sep 17 00:00:00 2001
+From: Nicolas Bock <nicolasbock@gmail.com>
+Date: Sat, 28 Sep 2013 07:47:36 -0600
+Subject: [PATCH] Properly test for None return value in navmenuGenerator.py
+
+---
+ doc/navmenuGenerator.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/doc/navmenuGenerator.py b/doc/navmenuGenerator.py
+index c10afb5..5e5b97c 100755
+--- a/doc/navmenuGenerator.py
++++ b/doc/navmenuGenerator.py
+@@ -13,7 +13,12 @@ fileName = sys.argv[1];
+ soup = BeautifulSoup(open(fileName), "lxml")
+ 
+ # Get just the table of contents from the index page
+-toc = soup.find("ul","ChildLinks").extract()
++toc = soup.find("ul","ChildLinks")
++
++if toc == None:
++  sys.exit(0)
++
++toc = toc.extract()
+ 
+ # Retain only part and chapter titles
+ for sctn in toc.select("li > ul > li > ul"):
+-- 
+1.8.1.5
+