| 1 |
commit: dbcfe1b03723acf9c1ec636072b0e1c9a1a9ebdf |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Oct 1 03:57:16 2013 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Oct 1 03:57:16 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dbcfe1b0 |
| 7 |
|
| 8 |
sys-cluster/charm-6.5.1-r1: Fix docs with -j1 |
| 9 |
|
| 10 |
Docs don't build when using anything more than -j1. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.1 |
| 13 |
|
| 14 |
--- |
| 15 |
sys-cluster/charm/ChangeLog | 5 ++++ |
| 16 |
sys-cluster/charm/charm-6.5.1-r1.ebuild | 14 +++++----- |
| 17 |
.../files/charm-6.5.1-fix-navmenuGenerator.patch | 30 ++++++++++++++++++++++ |
| 18 |
3 files changed, 42 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog |
| 21 |
index d005b5f..21f92a3 100644 |
| 22 |
--- a/sys-cluster/charm/ChangeLog |
| 23 |
+++ b/sys-cluster/charm/ChangeLog |
| 24 |
@@ -2,6 +2,11 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
# $Header: $ |
| 27 |
|
| 28 |
+ 01 Oct 2013; Nicolas Bock <nicolasbock@×××××.com> |
| 29 |
+ +files/charm-6.5.1-fix-navmenuGenerator.patch, charm-6.5.1-r1.ebuild: |
| 30 |
+ sys-cluster/charm-6.5.1-r1: Fix docs with -j1 Docs don't build when using |
| 31 |
+ anything more than -j1. |
| 32 |
+ |
| 33 |
27 Sep 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.1-r1.ebuild: |
| 34 |
sys-cluster/charm-6.5.1-r1: Added python dependencies The documentation is |
| 35 |
built partly with python2.x scripts. I added the necessary dependencies. |
| 36 |
|
| 37 |
diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild |
| 38 |
index d429138..9b027c8 100644 |
| 39 |
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild |
| 40 |
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild |
| 41 |
@@ -30,7 +30,7 @@ DEPEND=" |
| 42 |
)" |
| 43 |
|
| 44 |
REQUIRED_USE=" |
| 45 |
- doc? ( ${PYTHON_REQUIRED_USE} ) |
| 46 |
+ doc? ( ${PYTHON_REQUIRED_USE} ) |
| 47 |
cmkopt? ( !charmdebug !charmtracing ) |
| 48 |
charmproduction? ( !charmdebug !charmtracing )" |
| 49 |
|
| 50 |
@@ -98,6 +98,7 @@ src_prepare() { |
| 51 |
epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch" |
| 52 |
epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch" |
| 53 |
epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch" |
| 54 |
+ epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch" |
| 55 |
} |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
@@ -110,10 +111,9 @@ src_compile() { |
| 59 |
# make pdf/html docs |
| 60 |
if use doc; then |
| 61 |
python-single-r1_pkg_setup |
| 62 |
- python_fix_shebang ${S}/doc |
| 63 |
+ python_fix_shebang "${S}/doc" |
| 64 |
einfo "forcing ${EPYTHON}" |
| 65 |
- einfo "running ./build doc ${mybuildoptions}" |
| 66 |
- ./build doc ${mybuildoptions} || die "Failed to build charm++ documentation" |
| 67 |
+ emake -j1 -C doc/charm++ |
| 68 |
fi |
| 69 |
} |
| 70 |
|
| 71 |
@@ -190,13 +190,13 @@ src_install() { |
| 72 |
|
| 73 |
# Install pdf/html docs |
| 74 |
if use doc; then |
| 75 |
- cd "${S}"/doc |
| 76 |
+ cd "${S}/doc/charm++" |
| 77 |
# Install pdfs. |
| 78 |
insinto /usr/share/doc/${PF}/pdf |
| 79 |
- doins doc/pdf/* |
| 80 |
+ doins *.pdf |
| 81 |
# Install html. |
| 82 |
docinto html |
| 83 |
- dohtml -r doc/html/* |
| 84 |
+ dohtml -r manual/* |
| 85 |
fi |
| 86 |
} |
| 87 |
|
| 88 |
|
| 89 |
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 |
| 90 |
new file mode 100644 |
| 91 |
index 0000000..a19a8db |
| 92 |
--- /dev/null |
| 93 |
+++ b/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch |
| 94 |
@@ -0,0 +1,30 @@ |
| 95 |
+From 8b699f6c49df26b979da397b47c7dc7a099ed6b6 Mon Sep 17 00:00:00 2001 |
| 96 |
+From: Nicolas Bock <nicolasbock@×××××.com> |
| 97 |
+Date: Sat, 28 Sep 2013 07:47:36 -0600 |
| 98 |
+Subject: [PATCH] Properly test for None return value in navmenuGenerator.py |
| 99 |
+ |
| 100 |
+--- |
| 101 |
+ doc/navmenuGenerator.py | 7 ++++++- |
| 102 |
+ 1 file changed, 6 insertions(+), 1 deletion(-) |
| 103 |
+ |
| 104 |
+diff --git a/doc/navmenuGenerator.py b/doc/navmenuGenerator.py |
| 105 |
+index c10afb5..5e5b97c 100755 |
| 106 |
+--- a/doc/navmenuGenerator.py |
| 107 |
++++ b/doc/navmenuGenerator.py |
| 108 |
+@@ -13,7 +13,12 @@ fileName = sys.argv[1]; |
| 109 |
+ soup = BeautifulSoup(open(fileName), "lxml") |
| 110 |
+ |
| 111 |
+ # Get just the table of contents from the index page |
| 112 |
+-toc = soup.find("ul","ChildLinks").extract() |
| 113 |
++toc = soup.find("ul","ChildLinks") |
| 114 |
++ |
| 115 |
++if toc == None: |
| 116 |
++ sys.exit(0) |
| 117 |
++ |
| 118 |
++toc = toc.extract() |
| 119 |
+ |
| 120 |
+ # Retain only part and chapter titles |
| 121 |
+ for sctn in toc.select("li > ul > li > ul"): |
| 122 |
+-- |
| 123 |
+1.8.1.5 |
| 124 |
+ |
Archives