diff options
| author |   Christoph Junghans <junghans@gentoo.org> | 2017-09-03 08:20:44 -0600 |
|---|---|---|
| committer | Christoph Junghans <junghans@gentoo.org> | 2017-09-03 08:54:53 -0600 |
| commit | a43b03361a35f013dffbe8b82875763d40919a81 (patch) | |
| tree | 387862295077a472ef6e9797c360758e917992fd /sci-chemistry/votca-csg | |
| parent | app-doc/votca-csg-manual: initial commit (diff) | |
| download | gentoo-a43b03361a35f013dffbe8b82875763d40919a81.tar.gz gentoo-a43b03361a35f013dffbe8b82875763d40919a81.tar.bz2 gentoo-a43b03361a35f013dffbe8b82875763d40919a81.zip | |
sci-chemistry/votca-csg: live ebuild update
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'sci-chemistry/votca-csg')
| -rw-r--r-- | sci-chemistry/votca-csg/metadata.xml | 2 | ||||
| -rw-r--r-- | sci-chemistry/votca-csg/votca-csg-9999.ebuild | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml index e078f2b29958..795272141d7f 100644 --- a/sci-chemistry/votca-csg/metadata.xml +++ b/sci-chemistry/votca-csg/metadata.xml @@ -14,6 +14,6 @@ <flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csgapps</pkg></flag> </use> <upstream> - <remote-id type="github">votca/csg-tutorials</remote-id> + <remote-id type="github">votca/csg</remote-id> </upstream> </pkgmetadata> diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild index b3ef0f312d81..ea6ac3506f7f 100644 --- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild +++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild @@ -19,6 +19,7 @@ else inherit git-r3 EGIT_REPO_URI="https://github.com/${PN/-//}.git" KEYWORDS="" + PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} )" fi DESCRIPTION="Votca coarse-graining engine" @@ -51,12 +52,6 @@ src_unpack() { default else git-r3_src_unpack - if use doc; then - EGIT_REPO_URI="https://github.com/${PN/-//}-manual.git" - EGIT_BRANCH="master" - EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-manual"\ - git-r3_src_unpack - fi if use examples; then EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git" EGIT_BRANCH="master" @@ -84,15 +79,7 @@ src_install() { bashcomp_alias csg_call "${i##*/}" done if use doc; then - if [[ ${PV} = *9999* ]]; then - #we need to do that here, because we need an installed version of csg to build the manual - [[ ${CHOST} = *-darwin* ]] && \ - emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)" \ - || emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)" - newdoc "${WORKDIR}/${PN}"-manual/manual.pdf "${PN}-manual-${PV}.pdf" - else - dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf" - fi + [[ ${PV} != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf" cmake-utils_src_make -C "${CMAKE_BUILD_DIR}" html dodoc -r "${CMAKE_BUILD_DIR}"/share/doc/html fi |