commit: 8ea6d8dc6fdf1117e5f78354d17b6b6f6d20c270 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 26 22:12:19 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=8ea6d8dc
sci-libs/votca-tools: Fix EAPI-7 bump, drop unused eclasses CMAKE_MAKEFILE_GENERATOR=ninja is default in EAPI-7/cmake.eclass Use https Use double brackets Sort RDEPEND Add slot operator to sci-libs/fftw Use BDEPEND local mycmakeargs Bug: https://bugs.gentoo.org/773175 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/votca-tools/votca-tools-1.6.4.ebuild | 28 +++++++++++++-------------- sci-libs/votca-tools/votca-tools-9999.ebuild | 28 +++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild index ba77bc97616..21ffc1d3bba 100644 --- a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild +++ b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild @@ -3,40 +3,40 @@ EAPI=7 -CMAKE_MAKEFILE_GENERATOR="ninja" +inherit cmake -inherit cmake eutils multilib - -if [ "${PV}" != "9999" ]; then +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN/-//}.git"; + inherit git-r3 +else SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.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 tools library" -HOMEPAGE="http://www.votca.org"; +HOMEPAGE="https://www.votca.org/"; LICENSE="Apache-2.0" SLOT="0" IUSE="" RDEPEND=" + >=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat - >=dev-cpp/eigen-3.3 - sci-libs/fftw:3.0" - -DEPEND="${RDEPEND} + sci-libs/fftw:3.0= +" +DEPEND="${RDEPEND}" +BDEPEND=" >=app-text/txt2tags-2.5 - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( NOTICE ) src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_RC_FILES=OFF ) cmake_src_configure diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild index ba77bc97616..21ffc1d3bba 100644 --- a/sci-libs/votca-tools/votca-tools-9999.ebuild +++ b/sci-libs/votca-tools/votca-tools-9999.ebuild @@ -3,40 +3,40 @@ EAPI=7 -CMAKE_MAKEFILE_GENERATOR="ninja" +inherit cmake -inherit cmake eutils multilib - -if [ "${PV}" != "9999" ]; then +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN/-//}.git"; + inherit git-r3 +else SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.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 tools library" -HOMEPAGE="http://www.votca.org"; +HOMEPAGE="https://www.votca.org/"; LICENSE="Apache-2.0" SLOT="0" IUSE="" RDEPEND=" + >=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat - >=dev-cpp/eigen-3.3 - sci-libs/fftw:3.0" - -DEPEND="${RDEPEND} + sci-libs/fftw:3.0= +" +DEPEND="${RDEPEND}" +BDEPEND=" >=app-text/txt2tags-2.5 - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( NOTICE ) src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_RC_FILES=OFF ) cmake_src_configure
