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 7A8201381F3 for ; Fri, 27 Sep 2013 20:07:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29CFFE0C5E; Fri, 27 Sep 2013 20:07:50 +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 93466E0C5E for ; Fri, 27 Sep 2013 20:07:49 +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 5286F33E182 for ; Fri, 27 Sep 2013 20:07:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 00EB6E5309 for ; Fri, 27 Sep 2013 20:07:46 +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: <1380312433.d6c53b0a3c9f52a30f077536de11332d955312b1.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/charm/ChangeLog sys-cluster/charm/charm-6.5.1-r1.ebuild X-VCS-Directories: sys-cluster/charm/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: d6c53b0a3c9f52a30f077536de11332d955312b1 X-VCS-Branch: master Date: Fri, 27 Sep 2013 20:07:46 +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: 9bac6220-53b7-40c9-b4fc-c37805ab1e55 X-Archives-Hash: 02fc2d82ada303a778656ab1c3e5d4ee commit: d6c53b0a3c9f52a30f077536de11332d955312b1 Author: Nicolas Bock gmail com> AuthorDate: Fri Sep 27 20:07:13 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Fri Sep 27 20:07:13 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d6c53b0a sys-cluster/charm-6.5.1-r1: Added python dependencies The documentation is built partly with python2.x scripts. I added the necessary dependencies. Package-Manager: portage-2.2.1 --- sys-cluster/charm/ChangeLog | 4 ++++ sys-cluster/charm/charm-6.5.1-r1.ebuild | 22 ++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index fa7dd1d..d005b5f 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -3,6 +3,10 @@ # $Header: $ 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. + + 27 Sep 2013; Nicolas Bock charm-6.5.1-r1.ebuild: sys-cluster/charm-6.5.1-r1: doc depends on python-2 27 Sep 2013; Nicolas Bock charm-6.5.1-r1.ebuild: diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild index b4e2913..d429138 100644 --- a/sys-cluster/charm/charm-6.5.1-r1.ebuild +++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild @@ -4,9 +4,9 @@ EAPI=5 -PYTHON_DEPEND="doc? 2" +PYTHON_COMPAT=( python{2_6,2_7} ) -inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs +inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1 DESCRIPTION="Message-passing parallel language and runtime system" HOMEPAGE="http://charm.cs.uiuc.edu/" @@ -24,11 +24,13 @@ DEPEND=" >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base - dev-python/beautifulsoup + >=dev-python/beautifulsoup-4 media-libs/netpbm + ${PYTHON_DEPS} )" REQUIRED_USE=" + doc? ( ${PYTHON_REQUIRED_USE} ) cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing )" @@ -99,15 +101,19 @@ src_prepare() { } src_compile() { + local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} ${CFLAGS}" + # Build charmm++ first. - einfo "running ./build charm++ $(usex mpi 'mpi' 'net')-linux$(usex amd64 '-amd64' '') $(get_opts) ${MAKEOPTS} ${CFLAGS}" - ./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \ - $(get_opts) ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++" + einfo "running ./build charm++ ${mybuildoptions}" + ./build charm++ ${mybuildoptions} || die "Failed to build charm++" # make pdf/html docs if use doc; then - cd "${S}"/doc - make doc || die "failed to create pdf/html docs" + python-single-r1_pkg_setup + python_fix_shebang ${S}/doc + einfo "forcing ${EPYTHON}" + einfo "running ./build doc ${mybuildoptions}" + ./build doc ${mybuildoptions} || die "Failed to build charm++ documentation" fi }