commit: 239fa34edcca3183dc35551fe199077be52f59cc Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> AuthorDate: Thu Sep 24 05:18:48 2015 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> CommitDate: Thu Sep 24 05:21:14 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=239fa34e
sci-chemistry/votca-csg: sync with gx86 Package-Manager: portage-2.2.20.1 sci-chemistry/votca-csg/ChangeLog | 3 +++ sci-chemistry/votca-csg/votca-csg-9999.ebuild | 39 +++++++++++++++------------ 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog index 1c1eb1d..827dd5d 100644 --- a/sci-chemistry/votca-csg/ChangeLog +++ b/sci-chemistry/votca-csg/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 24 Sep 2015; Christoph Junghans <[email protected]> votca-csg-9999.ebuild: + sci-chemistry/votca-csg: sync with gx86 + 12 Feb 2015; Christoph Junghans <[email protected]> votca-csg-9999.ebuild: added support of hdf5, clean up diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild index 7f7a214..668702c 100644 --- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild +++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild @@ -11,14 +11,14 @@ inherit bash-completion-r1 cmake-utils multilib IUSE="doc examples extras +gromacs hdf5" PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )" if [ "${PV}" != "9999" ]; then - SRC_URI="http://downloads.votca.googlecode.com/hg/${P}.tar.gz - doc? ( http://downloads.votca.googlecode.com/hg/${PN}-manual-${PV}.pdf ) - examples? ( http://downloads.votca.googlecode.com/hg/${PN}-tutorials-${PV}.tar.gz )" + SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://github.com/${PN/-//}-manual/releases/download/v1.3_rc1/${PN}-manual-${PV}.pdf ) + examples? ( https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" + S="${WORKDIR}/${P#votca-}" else - SRC_URI="" - inherit mercurial - EHG_REPO_URI="https://code.google.com/p/votca.csg/"; + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN/-//}.git https://github.com/${PN/-//}.git"; KEYWORDS="" fi @@ -45,21 +45,25 @@ DEPEND="${RDEPEND} >=app-text/txt2tags-2.5 virtual/pkgconfig" -DOCS=( README NOTICE ) +DOCS=( README.md NOTICE CHANGELOG.md ) 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}/${PN}-manual" - use examples && mercurial_fetch \ - https://code.google.com/p/votca.csg-tutorials/ \ - votca.csg-tutorials \ - "${WORKDIR}/${PN}-tutorials" + git-r3_src_unpack + if use doc; then + EGIT_REPO_URI="git://github.com/${PN/-//}-manual.git 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="git://github.com/${PN/-//}-tutorials.git https://github.com/${PN/-//}-tutorials.git"; + EGIT_BRANCH="master" + EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\ + git-r3_src_unpack + fi fi } @@ -96,7 +100,8 @@ src_install() { if use examples; then insinto "/usr/share/doc/${PF}/tutorials" docompress -x "/usr/share/doc/${PF}/tutorials" - doins -r "${WORKDIR}/${PN}"-tutorials*/* + rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake* + doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/* fi }
