| 1 |
commit: a43b03361a35f013dffbe8b82875763d40919a81 |
| 2 |
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 3 14:20:44 2017 +0000 |
| 4 |
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 3 14:54:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43b0336 |
| 7 |
|
| 8 |
sci-chemistry/votca-csg: live ebuild update |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
sci-chemistry/votca-csg/metadata.xml | 2 +- |
| 13 |
sci-chemistry/votca-csg/votca-csg-9999.ebuild | 17 ++--------------- |
| 14 |
2 files changed, 3 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml |
| 17 |
index e078f2b2995..795272141d7 100644 |
| 18 |
--- a/sci-chemistry/votca-csg/metadata.xml |
| 19 |
+++ b/sci-chemistry/votca-csg/metadata.xml |
| 20 |
@@ -14,6 +14,6 @@ |
| 21 |
<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csgapps</pkg></flag> |
| 22 |
</use> |
| 23 |
<upstream> |
| 24 |
- <remote-id type="github">votca/csg-tutorials</remote-id> |
| 25 |
+ <remote-id type="github">votca/csg</remote-id> |
| 26 |
</upstream> |
| 27 |
</pkgmetadata> |
| 28 |
|
| 29 |
diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild |
| 30 |
index b3ef0f312d8..ea6ac3506f7 100644 |
| 31 |
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild |
| 32 |
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild |
| 33 |
@@ -19,6 +19,7 @@ else |
| 34 |
inherit git-r3 |
| 35 |
EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
| 36 |
KEYWORDS="" |
| 37 |
+ PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} )" |
| 38 |
fi |
| 39 |
|
| 40 |
DESCRIPTION="Votca coarse-graining engine" |
| 41 |
@@ -51,12 +52,6 @@ src_unpack() { |
| 42 |
default |
| 43 |
else |
| 44 |
git-r3_src_unpack |
| 45 |
- if use doc; then |
| 46 |
- EGIT_REPO_URI="https://github.com/${PN/-//}-manual.git" |
| 47 |
- EGIT_BRANCH="master" |
| 48 |
- EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-manual"\ |
| 49 |
- git-r3_src_unpack |
| 50 |
- fi |
| 51 |
if use examples; then |
| 52 |
EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git" |
| 53 |
EGIT_BRANCH="master" |
| 54 |
@@ -84,15 +79,7 @@ src_install() { |
| 55 |
bashcomp_alias csg_call "${i##*/}" |
| 56 |
done |
| 57 |
if use doc; then |
| 58 |
- if [[ ${PV} = *9999* ]]; then |
| 59 |
- #we need to do that here, because we need an installed version of csg to build the manual |
| 60 |
- [[ ${CHOST} = *-darwin* ]] && \ |
| 61 |
- emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)" \ |
| 62 |
- || emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)" |
| 63 |
- newdoc "${WORKDIR}/${PN}"-manual/manual.pdf "${PN}-manual-${PV}.pdf" |
| 64 |
- else |
| 65 |
- dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf" |
| 66 |
- fi |
| 67 |
+ [[ ${PV} != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf" |
| 68 |
cmake-utils_src_make -C "${CMAKE_BUILD_DIR}" html |
| 69 |
dodoc -r "${CMAKE_BUILD_DIR}"/share/doc/html |
| 70 |
fi |
Archives