diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-libs/cantera | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'sci-libs/cantera')
-rw-r--r-- | sci-libs/cantera/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/cantera/cantera-2.4.0-r4.ebuild | 131 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch | 17 |
3 files changed, 0 insertions, 150 deletions
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 264a01cf4562..186fd4bdfac6 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,8 +1,6 @@ AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528 -AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4 AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa212325c3883b9cead668ed294f23a2ac768f28e593916d07f2322e21846b97b40e336dfc742ed45a9b95f8f49531cd82d2055499f810e13c2f SHA512 a7ebfd8f9a6fa406d5a5847ad98e91aa9cbf53d194ec87d8479b88ad322df13308947fae61574ebd6254eeaa1bcb49a4cd3e30db2981cebcbf13241ab8e050d6 AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9 -EBUILD cantera-2.4.0-r4.ebuild 3028 BLAKE2B cacb43b61a63aba2ae8a55393ff8f0ea93c0bbea9266f182d3ac270e822b09a16865da60076e6ea059bc1c684c9a13e7291f3aed037ca2fa79c48d0844fd5051 SHA512 c3f361945f1d4756f8251fc3122a4b8ba36e5f5723c4d71742f8d089a41614669ecaf5462a8e2d5945b09611eda3a98f4d91736ca253202c44d1a6fd6cb22705 EBUILD cantera-2.4.0-r5.ebuild 3071 BLAKE2B e4a48b20a7446b1f521d2542c111f40603e708aef5940bee16447070cf00fd20e4f73778d054e33e68b92b0ae028dc8fbd89b0817367dcbeb96bc51305f13488 SHA512 0422fdea1f33a1e50aa6ec771234a87929c0827add0afc7cc2618db0cf275657b33d9f7aa95064eda4f2508d2cf7c5015c92d036058dda1838bd45d3b41cf68e MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705 diff --git a/sci-libs/cantera/cantera-2.4.0-r4.ebuild b/sci-libs/cantera/cantera-2.4.0-r4.ebuild deleted file mode 100644 index d3f8fb2e514b..000000000000 --- a/sci-libs/cantera/cantera-2.4.0-r4.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD=90 - -inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs - -DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" -HOMEPAGE="https://www.cantera.org" -SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+cti fortran pch +python test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( cti ) - ${PYTHON_REQUIRED_USE} - " - -RDEPEND=" - ${PYTHON_DEPS} - python? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ') - ) - <sci-libs/sundials-5.2.0:0= -" - -DEPEND=" - ${RDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - dev-libs/libfmt - python? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_MULTI_USEDEP}] - ') - ) - test? ( - >=dev-cpp/gtest-1.8.0 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}_${PV}_env.patch" - "${FILESDIR}/${PN}_${PV}_env_python_install.patch" - "${FILESDIR}/${PN}_${PV}_sundials4.patch" - ) - -pkg_setup() { - fortran-2_pkg_setup - python-single-r1_pkg_setup -} - -## Full list of configuration options of Cantera is presented here: -## http://cantera.org/docs/sphinx/html/compiling/config-options.html - -src_configure() { - scons_vars=( - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++11" - debug="no" - FORTRAN="$(tc-getFC)" - FORTRANFLAGS="${CXXFLAGS}" - optimize_flags="-Wno-inline" - renamed_shared_libraries="no" - use_pch=$(usex pch) -## In some cases other order can break the detection of right location of Boost: ## - system_fmt="y" - system_sundials="y" - system_eigen="y" - env_vars="all" - extra_inc_dirs="/usr/include/eigen3" - ) - use test || scons_vars+=( googletest="none" ) - - scons_targets=( - f90_interface=$(usex fortran y n) - python2_package="none" - ) - - if use cti ; then - local scons_python=$(usex python full minimal) - scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" ) - else - scons_targets+=( python3_package="none" ) - fi -} - -src_compile() { - escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr" -} - -src_test() { - escons test -} - -src_install() { - escons install stage_dir="${D}" libdirname="$(get_libdir)" - if ! use cti ; then - rm -r "${D}/usr/share/man" || die "Can't remove man files." - else - # Run the byte-compile of modules - python_optimize "${D}/$(python_get_sitedir)/${PN}" - fi -} - -pkg_postinst() { - if use cti && ! use python ; then - elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'" - elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism." - fi - - local post_msg=$(usex fortran "and Fortran " "") - elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory." - - if use python ; then - elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories." - fi -} diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch deleted file mode 100644 index 2e01fed1fa93..000000000000 --- a/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript ---- old/interfaces/cython/SConscript 2018-08-24 16:24:45.000000000 +0300 -+++ new/interfaces/cython/SConscript 2019-08-14 04:28:41.000000000 +0300 -@@ -83,10 +83,10 @@ - extra = '' - elif localenv['OS'] == 'Darwin': - extra = localenv.subst(' --prefix=${python%s_prefix}' % major) -- elif localenv['libdirname'] == 'lib64': -- # 64-bit RHEL / Fedora -+ elif localenv['libdirname'] != 'lib': -+ # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile - extra = localenv.subst( -- ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor)) -+ ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/${libdirname}/python%s.%s/site-packages' % (major, major, major, minor)) - else: - extra = '--user' - localenv.AppendENVPath( |