From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/votca-csg/
Date: Sun, 28 Feb 2021 18:08:45 +0000 (UTC) [thread overview]
Message-ID: <1614535695.17c2488c366953bf6fe189cde24aa4641935eeec.asturm@gentoo> (raw)
commit: 17c2488c366953bf6fe189cde24aa4641935eeec
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 12:48:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 18:08:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c2488c
sci-chemistry/votca-csg: Fix EAPI-7 bump, drop unused multilib
CMAKE_MAKEFILE_GENERATOR=ninja is default in EAPI-7/cmake.eclass
Use https
Use double brackets
Sort RDEPEND
Use BDEPEND
local mycmakeargs
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild | 46 +++++++++++++-------------
sci-chemistry/votca-csg/votca-csg-9999.ebuild | 42 +++++++++++------------
2 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
index 758dcc378f9..4a22a2fb766 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
@@ -3,62 +3,62 @@
EAPI=7
-CMAKE_MAKEFILE_GENERATOR="ninja"
+inherit bash-completion-r1 cmake
-inherit bash-completion-r1 cmake multilib
-
-IUSE="doc examples extras +gromacs hdf5"
-PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
-if [ "${PV}" != "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+ PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
+else
SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
doc? ( https://github.com/${PN/-//}-manual/releases/download/v${PV}/${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"
S="${WORKDIR}/${P#votca-}"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN/-//}.git"
- PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
+ PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
fi
DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
+HOMEPAGE="https://www.votca.org/"
LICENSE="Apache-2.0"
SLOT="0"
+IUSE="doc examples extras +gromacs hdf5"
RDEPEND="
- ~sci-libs/votca-tools-${PV}
+ app-shells/bash:*
>=dev-cpp/eigen-3.3
+ dev-lang/perl
+ ~sci-libs/votca-tools-${PV}
gromacs? ( sci-chemistry/gromacs:= )
hdf5? ( sci-libs/hdf5 )
- dev-lang/perl
- app-shells/bash:*"
-
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
>=app-text/txt2tags-2.5
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
DOCS=( README.md NOTICE CHANGELOG.md )
src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- default
- else
+ if [[ ${PV} == *9999 ]]; then
git-r3_src_unpack
if use examples; then
EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
EGIT_BRANCH="master"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
git-r3_src_unpack
fi
+ else
+ default
fi
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DWITH_GMX=$(usex gromacs)
- -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
+ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DWITH_RC_FILES=OFF
)
cmake_src_configure
diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index dd12065fadb..358ce54951d 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -3,59 +3,59 @@
EAPI=7
-CMAKE_MAKEFILE_GENERATOR="ninja"
+inherit bash-completion-r1 cmake
-inherit bash-completion-r1 cmake multilib
-
-IUSE="doc examples extras +gromacs hdf5"
-if [ "${PV}" != "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
examples? ( https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
S="${WORKDIR}/${P#votca-}"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN/-//}.git"
fi
DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
+HOMEPAGE="https://www.votca.org/"
LICENSE="Apache-2.0"
SLOT="0"
+IUSE="doc examples extras +gromacs hdf5"
RDEPEND="
- ~sci-libs/votca-tools-${PV}
+ app-shells/bash:*
>=dev-cpp/eigen-3.3
+ dev-lang/perl
+ ~sci-libs/votca-tools-${PV}
gromacs? ( sci-chemistry/gromacs:= )
hdf5? ( sci-libs/hdf5 )
- dev-lang/perl
- app-shells/bash:*"
-
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
>=app-text/txt2tags-2.5
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- default
- else
+ if [[ ${PV} == *9999 ]]; then
git-r3_src_unpack
if use examples; then
EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
EGIT_BRANCH="master"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
git-r3_src_unpack
fi
+ else
+ default
fi
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DWITH_GMX=$(usex gromacs)
- -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
+ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DWITH_RC_FILES=OFF
-DBUILD_CSGAPPS=ON
)
next reply other threads:[~2021-02-28 18:08 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 18:08 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-01 19:36 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/votca-csg/ Andreas Sturmlechner
2022-02-20 14:58 Christoph Junghans
2022-02-20 14:58 Christoph Junghans
2022-02-20 14:58 Christoph Junghans
2021-09-19 15:20 Christoph Junghans
2021-07-18 23:24 Christoph Junghans
2021-04-05 16:53 Andreas Sturmlechner
2021-03-28 10:02 Agostino Sarubbo
2021-03-27 16:07 Sam James
2021-03-19 19:46 Christoph Junghans
2021-03-14 19:15 Christoph Junghans
2021-01-18 10:14 David Seifert
2021-01-13 1:20 Christoph Junghans
2021-01-13 1:20 Christoph Junghans
2021-01-06 15:10 Fabian Groffen
2020-12-10 19:26 Christoph Junghans
2020-11-04 16:08 Christoph Junghans
2020-11-03 19:48 Christoph Junghans
2020-08-22 23:36 Christoph Junghans
2020-06-21 15:41 Christoph Junghans
2020-04-18 5:01 Christoph Junghans
2020-01-12 21:51 Christoph Junghans
2020-01-12 20:06 Christoph Junghans
2019-11-22 2:26 Christoph Junghans
2019-05-20 11:03 Mikle Kolyada
2019-05-06 16:41 Christoph Junghans
2019-01-31 20:16 Christoph Junghans
2018-11-24 23:44 Christoph Junghans
2018-10-25 0:44 Christoph Junghans
2018-09-28 12:37 Christoph Junghans
2017-09-03 14:55 Christoph Junghans
2017-09-03 13:41 Christoph Junghans
2017-07-30 10:04 Michał Górny
2016-12-20 14:30 Tobias Klausmann
2016-11-25 21:50 Christoph Junghans
2016-11-24 5:04 Christoph Junghans
2016-11-14 2:01 Christoph Junghans
2016-10-29 21:41 Christoph Junghans
2016-09-27 18:13 Christoph Junghans
2016-08-19 21:59 Christoph Junghans
2016-07-14 17:30 Christoph Junghans
2016-04-19 20:17 Ian Stakenvicius
2016-01-22 18:51 Michael Palimaka
2016-01-15 22:30 Christoph Junghans
2015-09-24 5:20 Christoph Junghans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1614535695.17c2488c366953bf6fe189cde24aa4641935eeec.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox