diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 44308 -> 44329 bytes | |||
-rw-r--r-- | sci-libs/cantera/Manifest | 1 | ||||
-rw-r--r-- | sci-libs/cantera/cantera-2.6.0-r1.ebuild | 148 | ||||
-rw-r--r-- | sci-libs/libecpint/Manifest | 1 | ||||
-rw-r--r-- | sci-libs/libecpint/libecpint-1.0.6.ebuild | 27 | ||||
-rw-r--r-- | sci-libs/libspatialindex/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild | 37 | ||||
-rw-r--r-- | sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild | 2 | ||||
-rw-r--r-- | sci-libs/rtabmap/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/rtabmap/files/ocv.patch | 30 | ||||
-rw-r--r-- | sci-libs/rtabmap/rtabmap-0.20.18.ebuild | 68 | ||||
-rw-r--r-- | sci-libs/sundials/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch | 15 | ||||
-rw-r--r-- | sci-libs/sundials/sundials-5.2.0.ebuild | 79 |
14 files changed, 2 insertions, 415 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 6a97f6542a56..e6360cf4a1ec 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 429233e25031..1e31cd1901e3 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,6 +1,5 @@ AUX cantera-2.6.0_drop_deprecated_open_U_option.patch 1363 BLAKE2B 236dc4ee368d0c172e372d9e263318460a8b7a3c6fca02e97a0d71fb1852a2bef00c8375e72957d9a5fff2091f3aae968bd73a872509e3890ab91871eb90ae81 SHA512 4f9f18874bab308462261e0efdfdbb1c1f7ad35382aed5a594da45190e18d9264ed314ca4f7cab29d16a83b5c30ba8fdc213461a549ec84bd201211848d63f1e AUX cantera-2.6.0_env.patch 3119 BLAKE2B 16844230d86a292c764da1aa4043b2eff177f2b8a94ed154c3f6a69c1737e85f6ddc9330d5ba6f26936994306381dcb40ab4e70c7b7b44bdbaf7d920ee1ef902 SHA512 12cdabc7cee106ee17050918b483245b39f927b5a5bb8f92bd6177c1d660cc18cd3a91b2710991fa09c44f58aaac464495b15ceb7ae13bf235d34a6caabe7bc4 DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 -EBUILD cantera-2.6.0-r1.ebuild 3542 BLAKE2B 212ea3d12fa2aa83430abdd2c700859d59a7ab0e540bd0e32dbd486370d2c98233e071e80e505eaf3bdc5722c953e6d83815d6985411db531d182551124e974f SHA512 62fee7f0d26c328786732ce3f76493d96dac4db944af3d585291be8bb10e1a8de88c24d2e60a3145e67877b568d2963092a09deeea0e6f17b982fe87f849a84b EBUILD cantera-2.6.0-r2.ebuild 3602 BLAKE2B 2d4b8da115ffaf5fe402f332a5a9b0a3d22836ad114c70d0d14759dd755ec3a0db55e9f2ca43b65a82e9903893420d1d22cfffab5310b40d10f27b567db27b19 SHA512 f4e4dd9e9d694e2eb380ab6af2b472930b9beb34ae4c2980c32c374bfe799e8e79b3d5a00b276ac953841dff5a3e0ad1cb57a420da4e55f97562b8b7c3464f27 MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704 diff --git a/sci-libs/cantera/cantera-2.6.0-r1.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild deleted file mode 100644 index cba332f43a27..000000000000 --- a/sci-libs/cantera/cantera-2.6.0-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" - -inherit 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 lapack +python test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( cti ) - ${PYTHON_REQUIRED_USE} -" - -RDEPEND=" - ${PYTHON_DEPS} - lapack? ( virtual/lapack ) - cti? ( - $(python_gen_cond_dep ' - dev-python/ruamel-yaml[${PYTHON_USEDEP}] - ') - ) - python? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) - dev-cpp/yaml-cpp - !lapack? ( sci-libs/sundials:0= ) - lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] ) -" - -DEPEND=" - ${RDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - dev-libs/libfmt - python? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - ') - ) - test? ( - >=dev-cpp/gtest-1.11.0 - python? ( - $(python_gen_cond_dep ' - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - ') - ) - ) -" - -PATCHES=( "${FILESDIR}/${P}_env.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=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++11" - debug="no" - FORTRAN="$(tc-getFC)" - FORTRANFLAGS="${FCFLAGS}" - optimize_flags="-Wno-inline" - renamed_shared_libraries="no" - use_pch="no" - ## In some cases other order can break the detection of right location of Boost: ## - system_fmt="y" - system_sundials="y" - system_eigen="y" - system_yamlcpp="y" - env_vars="all" - extra_inc_dirs="/usr/include/eigen3" - ) - use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) - use test || scons_vars+=( googletest="none" ) - - scons_targets=( - f90_interface=$(usex fortran y n) - ) - - if use cti ; then - local scons_python=$(usex python full minimal) - scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" ) - else - scons_targets+=( python_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 - - # User could remove this line if require static libs for development purpose - find "${ED}" -name '*.a' -delete || die -} - -pkg_postinst() { - if use cti && ! use python ; then - elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml" - 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/libecpint/Manifest b/sci-libs/libecpint/Manifest index b76681b103d6..3068d2991f2a 100644 --- a/sci-libs/libecpint/Manifest +++ b/sci-libs/libecpint/Manifest @@ -1,4 +1,3 @@ DIST libecpint-1.0.6.tar.gz 1331016 BLAKE2B 9b1a8452b6810eaca17eb9e6efe876537ae32e980593ec89681fa4b2d6eaf5a908d5971c774eccd75858025599eeeb119a74b03fdbf7bcee644316dc6acad0d9 SHA512 8b0bf20d263891255ea8828cb9df7c919155ef461a66ae6c8979e9996e3392ea1b7adf21ef9ad9188e2f56547c1e2b525c3711f7cd1ace2b3c09b8ae38f75ee8 EBUILD libecpint-1.0.6-r1.ebuild 778 BLAKE2B 0baecd52fbdd5301ddb2748ecccfffff37f0e5f4b06348bd7011bbb1a62e033bb44b932b449a5d8f5cd8555814101bb4afc005951d21c614df837a551b489ec4 SHA512 7a9363c63aeae9f3442b4e351cbd362988444b28eb54f2d3ac2038ca13f3a8de61579554634cc258af7153a62ae65f2fcaba43fb83d3f1fe4fc4c99a8cd44335 -EBUILD libecpint-1.0.6.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1 MISC metadata.xml 639 BLAKE2B 47cb0fcf12a38630e1505734a9aeb173eedd12ba943f9f232816f8283a165099573036bdc9e51d0d4d6866e965bc508253c5fa458905271c58311d6d464f3d27 SHA512 58e24471675a7f813f6cae2684c73b4f0c08c6e9379209e0a809e0621f72c7ae29ad15d387defd06989bb86cb257d5c874d1fa80f2bfa8ef644be05e38fe977f diff --git a/sci-libs/libecpint/libecpint-1.0.6.ebuild b/sci-libs/libecpint/libecpint-1.0.6.ebuild deleted file mode 100644 index 47004ee7019c..000000000000 --- a/sci-libs/libecpint/libecpint-1.0.6.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials" -HOMEPAGE="https://github.com/robashaw/libecpint" -SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/pugixml" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" - -src_configure() { - local mycmakeargs=( - -DLIBECPINT_BUILD_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest index 560d7fdf4807..b4a56121390d 100644 --- a/sci-libs/libspatialindex/Manifest +++ b/sci-libs/libspatialindex/Manifest @@ -1,6 +1,5 @@ AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87 AUX libspatialindex-1.9.3-use-system-gtest.patch 382 BLAKE2B 113e93e5d5f1524929c07f483f9df53d7b2b7b44bb104ae10564da0a9570be28b0da50ba12c8ed8879be782ff1df9124c85ff3884a4a683f098ebf7db83490dc SHA512 2eeb7f48e7adda39da8338d370d7278b9294f402ccd5506db22c94a5ab561e09429ef0f14df0d1befe9423d18413223814f86122810deb23b7b5e06459841e60 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066 -EBUILD libspatialindex-1.9.3-r1.ebuild 807 BLAKE2B 9ae03aa69a90294ebc560a77d46ce710a142b3e39dcdc73049e24b322049a8917cd26d4c7e2403db880b13668ff3d80ea86124b85a0622f0b1ba9a6e9aea619f SHA512 e5170c49acf772763690a54e282a5dd805fc45d44f09527632f919086678a185e3644254c719d7e70f11a4a4df9f7bbcd203966fa56424a5d1c0665df503142c -EBUILD libspatialindex-1.9.3-r2.ebuild 947 BLAKE2B 8b0ef83a1196e249c70dd7a1b3fb42b37abaece4b6bceb60fc05d1ec369f02416a19f219402b222d099726fce5ee78227e312949e6d4a033f65cb6d871d7aa97 SHA512 ba4d9f0f4304c0debadc948cca1918fd3dbeea7636c02af956b2c76e6613b4cfc5eeea115f4d35212bd7c9044f0d9f7752d869cb5560b5b9507aee656aac3002 +EBUILD libspatialindex-1.9.3-r2.ebuild 945 BLAKE2B dcb77eafabd1f083e1927d4e44fc5e22ba22c58a9e16f64ee4b7dacef08442ff962877e465518a1904bc10770f499691215ebe8480b951344726a7378c0abd6a SHA512 5b6fe6d6a58ee0ba968ab4d291f6ffbca85fcdd58b1c73d7fec778b52b6e7b0e0855ff0ece05eb6ce84f7cc31cb4850147608e117e8926cc65fe37cc7dad170c MISC metadata.xml 509 BLAKE2B 8ceda1e32220335480bb2f700a73e2a12457a77e9bdeefd0c67e7859569e54879a238735f0dddc673739c2affed542e9bef67c498a4ac3af1c09cd287af94bf6 SHA512 80e5b87ca4c0ede5e48381b4f51e9a8ae150f77bc5eaceff5fda645c3f8d3eb482825ab8a7cd5701f8a1f889b7c5fa68bbe1a3ceeac6e03df79944da3016942c diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild deleted file mode 100644 index ab14fc05522f..000000000000 --- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_P="spatialindex-src-${PV}" - -DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API" -HOMEPAGE="https://libspatialindex.org/ - https://github.com/libspatialindex/libspatialindex" -SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2" - -LICENSE="MIT" -SLOT="0/6" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="test? ( >=dev-cpp/gtest-1.10.0 )" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-respect-compiler-flags.patch - "${FILESDIR}"/${P}-use-system-gtest.patch -) - -src_configure() { - local mycmakeargs=( - -DSIDX_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild index d4063f6d21df..0b81b51c3059 100644 --- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild +++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P LICENSE="MIT" SLOT="0/6" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 543be0235736..524c95684aab 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,9 +1,6 @@ -AUX ocv.patch 1361 BLAKE2B a1d019c791e4d5d1fd9546fd5756f18a695ad3702c2dae9b83e989723a7aef497eeabc46058f151984e7e6c8e8134fa0f256cb637587e063496bf6becfb72c19 SHA512 6573dfddad74d5b75e59df6122fe42701e5b4e72b4d52c6c0fb41dba207d3261edd27f9e6ec3e548b42a70f65e37cb72615259402b391ebff1a8926c12a63964 AUX vtk.patch 507 BLAKE2B c6de651fa6bf13fb650f40232d27057f1bea78e2f3b45b2a6576d25bbde33bd3fea0b518f3317aa58238452e338f92d1f35f584017fb6a805cbb33230605a8a6 SHA512 c9fcb0352dd81c4440da0a8e4664497aebffa6c81e295cc304a43fa43b984b97d23d5dedd84b4d16dd979d509c7882c35aebecdb191b6c33c32b9183c053ad6b AUX yamlcpp.patch 675 BLAKE2B 269eb1d6f0e276cc6863d4ae8e8a3c73c6264b681a76f9bc32db185ed0c7b3a115b0fd1871569ff0ddb34dfd10c5aaafe658a620f70e4964bf196fd6ad57780c SHA512 fa8aabe06b75c2fdd3be222c4c51de6c5bc9ca9f2444c4e97cb63c910bf572f616cf0ac6381d4bf0a5f5fe07cb520eb6f748a4fcd19cf7cdd89f76a52da6a5bc -DIST rtabmap-0.20.18.tar.gz 21545395 BLAKE2B 1cd7727cc499f0c78fa62f94fca4517e9a5f1eb79e0690683da1c61536542a6d3e342794f4282c92aa725be221fd88afb1f730cc8e431bb9ac293bd73e7146cf SHA512 313b95ba741ecbbec721ce3c339b508e75578f2b85f23739d22ddda5be28c03104e9bb6c4ab8a45ac2225bd72c7b9e84b4c5a5ae7bd4d04b1bb054566be23fff DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f SHA512 bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942 -EBUILD rtabmap-0.20.18.ebuild 1541 BLAKE2B c30a4dd87b128e3f95b9efe8711a12cfcec05c08f727f97f2743ad92f332572a41445509c64476d3f8d2acb2ecac159f0872afb1d320552498ebfb3b77ff60f8 SHA512 42ce75938cf5960752a8cf1ea3e5b75c72480634c6d6b1df33baebd276ce060c9046fb30c732338ae2bc65c3e4627a8ca58f5713de0579e6b906a70df43c5038 EBUILD rtabmap-0.20.23.ebuild 1541 BLAKE2B 251451eb169e84f70109f7f43220e24187bd13089858e2de4005223ac6811a80f31b945512dcf4f68cf469b51878416b9323ee267aa0a7830b249d4eef3fcf15 SHA512 e84a9ab2203e9a45455da222a9d91fd48846c58a994425c32c7467e65ca0e260b4d11fa46306f47fee8d5701d4efd3de52236ab62f42c971d84a2b1aa18a7890 EBUILD rtabmap-9999.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99 MISC metadata.xml 472 BLAKE2B 141f2e2a39f7e3e8543c255995ecc14ee3168985e47a4c0882d32fdd884a81ca0aeade5a41092ce5525a54a0ac2802714e2c6031c09af9671682231378918c64 SHA512 a472fd8de805c23ebf8de91fdecab35cb5af78bb971ad10f8e4b23ab97efaffc3f7fa3ffbec457ab120d3fe75f4d021079a67d426f0df022be389f00bc311651 diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch deleted file mode 100644 index 642f2e1e911b..000000000000 --- a/sci-libs/rtabmap/files/ocv.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cf64b20e1fd5b7aca6f5f708e9b790aa41e799db Mon Sep 17 00:00:00 2001 -From: matlabbe <matlabbe@gmail.com> -Date: Tue, 10 May 2022 22:47:15 -0400 -Subject: [PATCH] =?UTF-8?q?Fixed=20error:=20=E2=80=98drawAxis=E2=80=99=20i?= - =?UTF-8?q?s=20not=20a=20member=20of=20=E2=80=98cv::aruco=E2=80=99=20(open?= - =?UTF-8?q?cv=204.5.5)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - corelib/src/MarkerDetector.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/corelib/src/MarkerDetector.cpp b/corelib/src/MarkerDetector.cpp -index b59cb9468..2a3957f90 100644 ---- a/corelib/src/MarkerDetector.cpp -+++ b/corelib/src/MarkerDetector.cpp -@@ -304,7 +304,11 @@ std::map<int, MarkerInfo> MarkerDetector::detect(const cv::Mat & image, - std::map<int, MarkerInfo>::iterator iter = detections.find(ids[i]); - if(iter!=detections.end()) - { -+#if CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && (CV_MINOR_VERSION >1 || (CV_MINOR_VERSION==1 && CV_PATCH_VERSION>=1))) -+ cv::drawFrameAxes(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f); -+#else - cv::aruco::drawAxis(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f); -+#endif - } - } - } diff --git a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild b/sci-libs/rtabmap/rtabmap-0.20.18.ebuild deleted file mode 100644 index 61f45ae6ab9f..000000000000 --- a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake multilib - -VER_SUFFIX=rolling - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P}-${VER_SUFFIX}" -fi - -DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" -LICENSE="BSD" -SLOT="0" -IUSE="examples ieee1394 openni2 qt5" - -RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk,qt5(-)?] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= - dev-cpp/yaml-cpp:= - ieee1394? ( media-libs/libdc1394:2= ) - openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/yamlcpp.patch" "${FILESDIR}/ocv.patch" ) - -src_configure() { - local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - # Needed since we force ros crawling to be done only in - # /usr/share/ros_packages/ - insinto /usr/share/ros_packages/${PN} - doins "${ED}/usr/share/${PN}/package.xml" -} diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest index f6408a030ca9..02d7cca01c24 100644 --- a/sci-libs/sundials/Manifest +++ b/sci-libs/sundials/Manifest @@ -1,10 +1,7 @@ -AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84a00e9ad98511bc6bfee8cd5d18c7d94661e25ea7cf6feae3c510a3c8532de61f40a2c351597ddee40a0c3fd35cec85002b9702352cbc3f SHA512 33c16064576d28d1768ec1c7232b5f1d9dbb786e24a390d970ba05b1b14df1b5589e6d6857ef84e66f2e4541a995509754f1abcf55e9e2e6dfbead81233efd8b AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aedb7599f6c2de33adc7b63f60ccce831f494006b41664acf31ccf838ca9715c4470309648935b194a0706f487cdc6e4b1a3ba52c0ca3c941 SHA512 7775dd78cd4dfbf647087058126314305232657c6f32d4811bc181902d925cee51142e92e2f50c15c02475b2b6c4f1c7be70a223dbf838b9205a811ed9fca4a9 -DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b DIST sundials-6.5.0.tar.gz 89142911 BLAKE2B 3605686f813928fe55e5aafd409c478cf782411b5d2e510121fe15cc15eae84a5d0fe7470c7c0c976fbe11e7f0fd0e9fb449ae45b4c34aa077ac1acb25255cf5 SHA512 30ad3d3f998df6a6381a14b0c8fe247a5507e386ed1b9b55afae87b976f15026d7b4e8609c3cf8423ad79e1b55bade40dc66b274dc3422e040cb12fec981d502 -EBUILD sundials-5.2.0.ebuild 2173 BLAKE2B c7765f5fbb12395c2474f352a3200225cb2ec75360fa2089bf34ee0ddb313d136b0e66ad1955936bac2bf6f6e63bca055e7077d46fb92a69771417c51b86fb9a SHA512 00d5b62fabe026e5637cd655dc53ba12e4ff8db286b451e79a993b18ef09dcbce58805424c903bfb35ebbfcd2881873f91cfb63faa353f1789bd95fba7f17a17 EBUILD sundials-5.8.0.ebuild 2759 BLAKE2B 2f2872218e337cda6e067925f4f67ce4021a284d0d4badb31737efd6fc0917808769c24b74df4086aaef08384bd36dd744358b9d797da08c40d34f5b1aa34bdc SHA512 7cdaed08db6eab4713df5477d3051d009881cb1ef38714496618f56f831ab9e3973a0b37092cc716512c5d8dc6ed73cbb7da2fb46d0373b066290c48993cd805 EBUILD sundials-6.2.0.ebuild 2723 BLAKE2B 3d0bdf7847bb61ff87b78a3fdc806d3edcf9d72422d5c27dc05c69ffbf69a609777e25d9b2931bd11b70c911de76e84dcb06843f39aed05f5c76d56474abf78f SHA512 a3e17643240fbcb9383cccf5b90122f53f19d27213d978aa0315db52e1afa20d8c0afa57a52f6315a7050f8112e0f03d558d3b60448bc661cc4054a328ed6ff8 EBUILD sundials-6.5.0.ebuild 2665 BLAKE2B f1c6007a8a6ee04e9ee281c224a9b285291fcd6b1ec16091744f2a16e515d4fc059e2f7a932be4dcfc67b86ecbbbc672259a9c7d7619a3ca3755e6add3628165 SHA512 e09f37403f2762d086ca901982eb960a20c697af573f7753e4b0dae61513d3c6ddc6a7dbfc9bb7623f50d94c1a06d8958cd9da58fcc49b321c4bc87437ee3553 diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch deleted file mode 100644 index 8fb6c977ca76..000000000000 --- a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-04-01 00:03:37.000000000 +0300 -+++ b/CMakeLists.txt 2020-04-21 13:27:58.000000000 +0300 -@@ -1146,9 +1146,9 @@ - # install license and notice files - install( - FILES ${PROJECT_SOURCE_DIR}/LICENSE -- DESTINATION include/sundials -+ DESTINATION share/doc/sundials-5.2.0 - ) - install( - FILES ${PROJECT_SOURCE_DIR}/NOTICE -- DESTINATION include/sundials -+ DESTINATION share/doc/sundials-5.2.0 - ) diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild deleted file mode 100644 index 5af24cd4ed75..000000000000 --- a/sci-libs/sundials/sundials-5.2.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" -# if FFLAGS and FCFLAGS are set then should be equal - -inherit cmake fortran-2 toolchain-funcs flag-o-matic - -DESCRIPTION="Suite of nonlinear solvers" -HOMEPAGE="https://computation.llnl.gov/projects/sundials" -SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads" -REQUIRED_USE="hypre? ( mpi )" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - lapack? ( virtual/lapack ) - mpi? ( virtual/mpi sci-libs/hypre:= ) - sparse? ( sci-libs/klu ) - superlumt? ( sci-libs/superlu_mt:= ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - # bug #707240 - append-cflags -fcommon - - cmake_src_prepare -} - -src_configure() { - mycmakeargs+=( - -DBUILD_SHARED_LIBS=ON - -DBUILD_STATIC_LIBS="$(usex static-libs)" - -DCXX_ENABLE="$(usex cxx)" - -DFCMIX_ENABLE="$(usex fortran)" - -DF90_ENABLE="$(usex fortran)" - -DHYPRE_ENABLE="$(usex hypre)" - -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre" - -DKLU_ENABLE="$(usex sparse)" - -DLAPACK_ENABLE="$(usex lapack)" - -DMPI_ENABLE="$(usex mpi)" - -DOPENMP_ENABLE="$(usex openmp)" - -DPTHREAD_ENABLE="$(usex threads)" - -DSUPERLUMT_ENABLE="$(usex superlumt)" - -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt" - -DSUPERLUMT_LIBRARY="-lsuperlu_mt" - -DEXAMPLES_ENABLE="$(usex examples)" - -DEXAMPLES_INSTALL=ON - -DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples" - -DUSE_GENERIC_MATH=ON - ) - use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" ) - cmake_src_configure -} - -src_install() { - cmake_src_install - use doc && dodoc doc/*/*.pdf -} |