commit: 67ddc7ad6e84157ac88fabc1731218f41f8fec3e
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 17 11:51:32 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:51:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ddc7ad
sci-libs/cantera: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r4.ebuild | 131 ---------------------
.../files/cantera_2.4.0_env_python_install.patch | 17 ---
2 files changed, 148 deletions(-)
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 d3f8fb2e514..00000000000
--- 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 2e01fed1fa9..00000000000
--- 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(
