From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1256146-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8C1AC1382C5
for <garchives@archives.gentoo.org>; Sun, 28 Feb 2021 18:08:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B6BFBE093B;
Sun, 28 Feb 2021 18:08:48 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8CB89E093B
for <gentoo-commits@lists.gentoo.org>; Sun, 28 Feb 2021 18:08:48 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E38EB3410F3
for <gentoo-commits@lists.gentoo.org>; Sun, 28 Feb 2021 18:08:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6ED7D532
for <gentoo-commits@lists.gentoo.org>; Sun, 28 Feb 2021 18:08:45 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1614535695.17c2488c366953bf6fe189cde24aa4641935eeec.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/votca-csg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild sci-chemistry/votca-csg/votca-csg-9999.ebuild
X-VCS-Directories: sci-chemistry/votca-csg/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 17c2488c366953bf6fe189cde24aa4641935eeec
X-VCS-Branch: master
Date: Sun, 28 Feb 2021 18:08:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 21ae22bd-25d4-451a-b9e1-0ff9d21cc4cc
X-Archives-Hash: eb78a2aaf88c0b1513cf723026cfb04b
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
)