From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E074C1381F3 for ; Tue, 1 Oct 2013 03:59:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8628BE09EB; Tue, 1 Oct 2013 03:59:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08C22E09D5 for ; Tue, 1 Oct 2013 03:59:10 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB0AA33E906 for ; Tue, 1 Oct 2013 03:59:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7F7A8E5309 for ; Tue, 1 Oct 2013 03:59:08 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1380599836.dbcfe1b03723acf9c1ec636072b0e1c9a1a9ebdf.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/charm/ChangeLog sys-cluster/charm/charm-6.5.1-r1.ebuild sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch X-VCS-Directories: sys-cluster/charm/ sys-cluster/charm/files/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: dbcfe1b03723acf9c1ec636072b0e1c9a1a9ebdf X-VCS-Branch: master Date: Tue, 1 Oct 2013 03:59:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2d3e2c01-e578-45e7-a8b1-dfb3ab2cab78 X-Archives-Hash: b4ebcfbb3d3b24dd06280cc302d29ac4 commit: dbcfe1b03723acf9c1ec636072b0e1c9a1a9ebdf Author: Nicolas Bock gmail com> AuthorDate: Tue Oct 1 03:57:16 2013 +0000 Commit: Nicolas Bock gmail 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 + +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 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 +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 +