diff options
author | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2021-01-29 21:58:35 +0100 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2021-01-29 21:58:56 +0100 |
commit | c3b31fbf6cd0020a516e092684accc3a820a7436 (patch) | |
tree | 65040aebb63082048088f773961d97bc9345a26f | |
parent | sci-misc/jwnl: fix install location of config xml files (diff) | |
download | sci-c3b31fbf6cd0020a516e092684accc3a820a7436.tar.gz sci-c3b31fbf6cd0020a516e092684accc3a820a7436.tar.bz2 sci-c3b31fbf6cd0020a516e092684accc3a820a7436.zip |
sci-libs/asl: camke-utils --> cmake, fix compilation
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
-rw-r--r-- | sci-libs/asl/Manifest | 15 | ||||
-rw-r--r-- | sci-libs/asl/asl-0.1.6.ebuild | 47 | ||||
-rw-r--r-- | sci-libs/asl/asl-0.1.7.ebuild | 20 | ||||
-rw-r--r-- | sci-libs/asl/asl-9999.ebuild | 19 |
4 files changed, 38 insertions, 63 deletions
diff --git a/sci-libs/asl/Manifest b/sci-libs/asl/Manifest index 8cbb846f4..ff6dc9f58 100644 --- a/sci-libs/asl/Manifest +++ b/sci-libs/asl/Manifest @@ -1,2 +1,15 @@ -DIST asl-0.1.6.tar.gz 586423 BLAKE2B 16b272e32a3baa3311fe0cb6ec0ade8a8193fe082242733e470cbc2815413eb0f90081b1b7655e286b3868a8a80deb10744f36f760cbe1f95395dbb54cae7e92 SHA512 15b980a4e44eadcc751f5a8fff564ff28fdbdb45582f9632c6a9d4010439c4b19a00507f8f4ae97ac0b687aad00591cbd96520dd4690975e9daefef46ce6b33e +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST asl-0.1.7.tar.gz 588208 BLAKE2B a29259f2d7cc4851170840397e4aabfcac877f0c503ad94b5707e6b7cd7de7acd15b74b5f7f5852e65758d3edd5d59b39d3d7e3603f0fcccc64db9ff30dfe989 SHA512 337754adefa8619bbc2ab0e06fc811dd1cc550252b165241a265f87224aa84c5ee69fb3bf60324093df5b21aa87712e2210d4bcdd8593f0740183574528a30bd +-----BEGIN PGP SIGNATURE----- + +iQEzBAEBCAAdFiEEBv9TQb2AXbC8fQemoZ9jbNTtvNEFAmAUdvYACgkQoZ9jbNTt +vNGSvQf/QNgUu8KySELDbFHdAokkgMh39RMzxg53PZhnW/GNtBjVMKGs0PVpozj7 +G+k5l36RvK6zSx0IXW2sewHeAVBbUyrfg0hQnPb8cCl9WPMeDuTNSMRSd6ZvHhpF +wPRlkYij9zBlFz64AcCpKcWfT5MT9KY+YuFexTv1T7KCsSf3I7DQ5VKVjj6tuUuJ +Br41RJdykHHV3MLJo3hV61A0NH6gdYEEP0XsyXcGb/CDtK0Uu176RkUvQB9OOwlU +s/6Iefy4DaBoMUdTkRRzg8+gVPPS9B/YD7gsvfmCFlmxy8otnQraq79E8uS1qEtF +oIqWMmC0iX4WM9Mu8vJjo7E11C59yg== +=gRSh +-----END PGP SIGNATURE----- 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 } |