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 860E913875A for ; Wed, 30 Jan 2013 05:28:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EF0F21C039; Wed, 30 Jan 2013 05:28:14 +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 B2F8A21C039 for ; Wed, 30 Jan 2013 05:28:13 +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 9BC8433DB87 for ; Wed, 30 Jan 2013 05:28:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 48EC0E4073 for ; Wed, 30 Jan 2013 05:28:10 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1359523673.791b1a7e08cd16a7f36b7494e50e462dbb28f27c.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/votca-csg/ChangeLog sci-chemistry/votca-csg/votca-csg-9999.ebuild X-VCS-Directories: sci-chemistry/votca-csg/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 791b1a7e08cd16a7f36b7494e50e462dbb28f27c X-VCS-Branch: master Date: Wed, 30 Jan 2013 05:28:10 +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: 891041ae-1c1f-4834-b856-daf0f49f2c1e X-Archives-Hash: 954aa01ee9ddbfff2159697c8921184d commit: 791b1a7e08cd16a7f36b7494e50e462dbb28f27c Author: Christoph Junghans gentoo org> AuthorDate: Wed Jan 30 05:27:53 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Wed Jan 30 05:27:53 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=791b1a7e clean up + merge csg-{manual,tutorials} Package-Manager: portage-2.2.0_alpha161 --- sci-chemistry/votca-csg/ChangeLog | 5 ++- sci-chemistry/votca-csg/votca-csg-9999.ebuild | 43 +++++++++++++++++++----- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog index bd1f2d3..0e965ae 100644 --- a/sci-chemistry/votca-csg/ChangeLog +++ b/sci-chemistry/votca-csg/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-chemistry/votca-csg -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Jan 2013; Christoph Junghans votca-csg-9999.ebuild: + clean up + merge csg-{manual,tutorials} + 31 Dec 2012; Christoph Junghans votca-csg-9999.ebuild: update EHG_REPO_URI diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild index 10953bc..2a3c943 100644 --- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild +++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit bash-completion-r1 cmake-utils multilib @@ -17,8 +17,6 @@ else SRC_URI="" inherit mercurial EHG_REPO_URI="https://code.google.com/p/votca.csg/" - PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} ) - examples? ( =sci-chemistry/${PN}-tutorials-${PV} )" fi DESCRIPTION="Votca coarse-graining engine" @@ -29,17 +27,38 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" RDEPEND="=sci-libs/votca-tools-${PV} - gromacs? ( sci-chemistry/gromacs ) + gromacs? ( sci-chemistry/gromacs:= ) dev-lang/perl app-shells/bash" DEPEND="${RDEPEND} - doc? ( || ( =app-doc/doxygen-1.7.6.1[dot] ) ) + doc? ( + || ( =app-doc/doxygen-1.7.6.1[dot] ) + dev-texlive/texlive-latexextra + virtual/latex-base + dev-tex/pgf + ) >=app-text/txt2tags-2.5 virtual/pkgconfig" DOCS=( README NOTICE ) +src_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + mercurial_src_unpack + use doc && mercurial_fetch \ + https://code.google.com/p/votca.csg-manual/ \ + votca.csg-manual \ + "${WORKDIR}/manual" + use examples && mercurial_fetch \ + https://code.google.com/p/votca.csg-tutorials/ \ + votca.csg-tutorials \ + "${WORKDIR}/${PN}-tutorials" + fi +} + src_configure() { local GMX_DEV="OFF" GMX_DOUBLE="OFF" extra @@ -56,6 +75,7 @@ src_configure() { $(cmake-utils_use_with gromacs GMX) -DWITH_GMX_DEVEL="${GMX_DEV}" -DGMX_DOUBLE="${GMX_DOUBLE}" + -DCMAKE_INSTALL_RPATH="\\\$ORIGIN/../$(get_libdir)" ${extra} -DWITH_RC_FILES=OFF -DLIB=$(get_libdir) @@ -67,17 +87,22 @@ src_install() { newbashcomp scripts/csg-completion.bash ${PN} cmake-utils_src_install if use doc; then - if [ -n "${PV##*9999}" ]; then + if [[ ${PV} = *9999* ]]; then + pushd "${WORKDIR}"/manual + emake PATH="${PATH}:${ED}/usr/bin" + newdoc manual.pdf "${PN}-manual-${PV}.pdf" + popd > /dev/null + else dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf" fi cd "${CMAKE_BUILD_DIR}" || die emake html dohtml -r share/doc/html/* fi - if use examples && [ -n "${PV##*9999}" ]; then + if use examples; then insinto "/usr/share/doc/${PF}/tutorials" docompress -x "/usr/share/doc/${PF}/tutorials" - doins -r "${WORKDIR}/${PN}-tutorials-${PV}"/* + doins -r "${WORKDIR}/${PN}"-tutorials*/* fi }