From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 80885138239 for ; Fri, 29 Jan 2021 20:59:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A737E0A99; Fri, 29 Jan 2021 20:59:27 +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 6ADBAE0A99 for ; Fri, 29 Jan 2021 20:59:27 +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 476D5340C19 for ; Fri, 29 Jan 2021 20:59:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE1FF47 for ; Fri, 29 Jan 2021 20:59:24 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1611953936.c3b31fbf6cd0020a516e092684accc3a820a7436.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/asl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/asl/asl-0.1.6.ebuild sci-libs/asl/asl-0.1.7.ebuild sci-libs/asl/asl-9999.ebuild X-VCS-Directories: sci-libs/asl/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c3b31fbf6cd0020a516e092684accc3a820a7436 X-VCS-Branch: master Date: Fri, 29 Jan 2021 20:59:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 80c73b5e-93a2-43ee-9597-c0ec11905284 X-Archives-Hash: 7a865ae7bd86b2be8f478db1b9ad99bd commit: c3b31fbf6cd0020a516e092684accc3a820a7436 Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Jan 29 20:58:35 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Fri Jan 29 20:58:56 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c3b31fbf sci-libs/asl: camke-utils --> cmake, fix compilation Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> sci-libs/asl/asl-0.1.6.ebuild | 47 ------------------------------------------- sci-libs/asl/asl-0.1.7.ebuild | 20 +++++++++++------- sci-libs/asl/asl-9999.ebuild | 19 +++++++++-------- 3 files changed, 24 insertions(+), 62 deletions(-) diff --git a/sci-libs/asl/asl-0.1.6.ebuild b/sci-libs/asl/asl-0.1.6.ebuild deleted file mode 100644 index 397f4b260..000000000 --- a/sci-libs/asl/asl-0.1.6.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_PN=ASL - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/AvtechScientific/${MY_PN}.git" -else - SRC_URI="https://github.com/AvtechScientific/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -CMAKE_MIN_VERSION=3.0.2 -CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-ninja}" - -inherit cmake-utils - -DESCRIPTION="Advanced Simulation Library - multiphysics simulation software package" -HOMEPAGE="http://asl.org.il/" -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc examples matlab" - -RDEPEND=" - >=dev-libs/boost-1.55:= - >=sci-libs/vtk-6.1 - >=virtual/opencl-0-r2 -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - matlab? ( >=sci-libs/matio-1.5.2 ) -" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_SKIP_RPATH=yes - $(cmake-utils_use_with doc API_DOC) - $(cmake-utils_use_with examples) - $(cmake-utils_use_with matlab) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/asl/asl-0.1.7.ebuild b/sci-libs/asl/asl-0.1.7.ebuild index 062763511..50eaeea5d 100644 --- a/sci-libs/asl/asl-0.1.7.ebuild +++ b/sci-libs/asl/asl-0.1.7.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MY_PN=ASL -CMAKE_MIN_VERSION=3.0.2 CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-ninja}" -inherit cmake-utils +inherit cmake DESCRIPTION="Hardware accelerated multiphysics simulation platform" HOMEPAGE="http://asl.org.il/" @@ -15,21 +14,28 @@ SRC_URI="https://github.com/AvtechScientific/${MY_PN}/archive/v${PV}.tar.gz -> $ LICENSE="AGPL-3" SLOT="0" -IUSE="doc examples matlab" KEYWORDS="~amd64 ~x86" +IUSE="doc examples matlab" + RDEPEND=" >=dev-libs/boost-1.53:= >=sci-libs/vtk-6.1 >=virtual/opencl-0-r2 " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) matlab? ( >=sci-libs/matio-1.5.2 ) " +BDEPEND="doc? ( app-doc/doxygen[dot] )" S="${WORKDIR}/${MY_PN}-${PV}" +src_prepare() { + cmake_src_prepare + # allow use of vtk 8.2 + sed -i -e 's/find_package(VTK 7.0/find_package(VTK 8.2/g' CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} @@ -38,5 +44,5 @@ src_configure() { -DWITH_EXAMPLES="$(usex examples)" -DWITH_MATIO="$(usex matlab)" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/sci-libs/asl/asl-9999.ebuild b/sci-libs/asl/asl-9999.ebuild index 7f540d17a..82b464f7f 100644 --- a/sci-libs/asl/asl-9999.ebuild +++ b/sci-libs/asl/asl-9999.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MY_PN=ASL -CMAKE_MIN_VERSION=3.0.2 CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-ninja}" -inherit cmake-utils git-r3 +inherit cmake git-r3 DESCRIPTION="Hardware accelerated multiphysics simulation platform" HOMEPAGE="http://asl.org.il/" -SRC_URI="" EGIT_REPO_URI="git://github.com/AvtechScientific/${MY_PN}.git" LICENSE="AGPL-3" SLOT="0" IUSE="doc examples matlab" -KEYWORDS="" RDEPEND=" >=dev-libs/boost-1.53:= @@ -25,9 +22,15 @@ RDEPEND=" >=virtual/opencl-0-r2 " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) matlab? ( >=sci-libs/matio-1.5.2 ) " +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +src_prepare() { + cmake_src_prepare + # allow use of vtk 8.2 + sed -i -e 's/find_package(VTK 7.0/find_package(VTK 8.2/g' CMakeLists.txt || die +} src_configure() { local mycmakeargs=( @@ -37,5 +40,5 @@ src_configure() { -DWITH_EXAMPLES="$(usex examples)" -DWITH_MATIO="$(usex matlab)" ) - cmake-utils_src_configure + cmake_src_configure }