diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
| commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
| tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /sci-libs/cminpack | |
| parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) | |
gentoo resync : 12.03.2021
Diffstat (limited to 'sci-libs/cminpack')
| -rw-r--r-- | sci-libs/cminpack/Manifest | 6 | ||||
| -rw-r--r-- | sci-libs/cminpack/cminpack-1.3.8.ebuild (renamed from sci-libs/cminpack/cminpack-1.3.5.ebuild) | 21 | ||||
| -rw-r--r-- | sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch | 10 | ||||
| -rw-r--r-- | sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch | 10 |
4 files changed, 24 insertions, 23 deletions
diff --git a/sci-libs/cminpack/Manifest b/sci-libs/cminpack/Manifest index 89ee9c6d03af..f0d72cad6a14 100644 --- a/sci-libs/cminpack/Manifest +++ b/sci-libs/cminpack/Manifest @@ -1,4 +1,4 @@ -AUX cminpack-1.3.5-underlinking.patch 338 BLAKE2B 65f3d7014529ea914067fd8a46bc6812fb688e456f416bab8af2ac145833321c0bbc1cbce1e8901bc1b3c76862f273e69db32a483b50903824baffc065d4115a SHA512 e75edbe045d6936d09a2454504fba6b5b5535424aa1c7603df4b55416e801d27f74f1e2db1038193d36262a12734760138df1c66b6c3d9e6d318f124e7409307 -DIST cminpack-1.3.5.tar.gz 312932 BLAKE2B 52ab91490f7c569e3931346510e08db55166322399736ceb9cc090a3be3624e8db6de12ed33ee8f97f6c5358dc2488f8aa7c7aab81365316f1dbb8948e669a2e SHA512 bb6f1764d90ccc7cbbb114a509f5416567246a730e4329617671e01b535b3a69f6a6df0483810ad1ad28228a1061a3595a15d437647b94a8a2013203905c6fed -EBUILD cminpack-1.3.5.ebuild 845 BLAKE2B bbbb439f79afb649233d934bb4bd2e3497e61460a71809cbda8c269987436504a80386aebcc1d78ce9c0651309a2feabd46887a0b63582d3bd1283733beb3ebb SHA512 a3b23a4dcf8523675512a3e045d481cf9412316f829cfabcb3c6a7acfcb1457726b5576cd16f10dd2700c09a738dfe04f546f79152347b14f7fd7f21dce1fa1b +AUX cminpack-1.3.8-cmake.patch 374 BLAKE2B 3f4d610a4fb577d3c6d7e31b1789e212749b0cdeed3d9f5494d2507ff8d218897d052048afbd300a1181a045734a324de3d5d3177c82d330f4c7aaab09ad60ac SHA512 d9434a5bf97dcbad67d7dc1ff7bb45f51bb4cd239096a7ae0c807a96c0feacd50d73823dccc0d1e6622057386f9687f2e808e60b9ea953593eea3f58dbc129a5 +DIST cminpack-1.3.8.tar.gz 341494 BLAKE2B 5aebb220f9d5d1b314331a621d3717e4568eea6c37d0a70b935eda1fc0bec11d81b07c8951c8a8bfe5edd81e7878e138f8921d96a96c40230bfc423991e766be SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae +EBUILD cminpack-1.3.8.ebuild 805 BLAKE2B ce4d16a0acc6c6067abc61c145893677dd0ffdc4b505698b44268ef7a864bc00dd25ba1315fec701c5f77ab1b59f028d2595cdb8e90d6bc1522bba2423144bd7 SHA512 c63610f2f85ba377a36fcbd7666f321105b4e6627f2db2300d79e55510f9a0b86e0778b0a942630e157de699f1c63ab99336df39e24500434d5be3ba65079d41 MISC metadata.xml 993 BLAKE2B e037c0d06b1c6192de166d3ced5f6dbc92229fd268ee83e0e6589b05314906c5469d521c61b8d88b6e6c66e877e54e15fd6d7e57b16fa27b62167671d3b0c274 SHA512 d488a3fe1cfc9a04264d7e6078b033b4056236736d7466a609e308988c9e36c25d4fdce24bb3606e8b9878a63ee3ec9a660ab296f081004b601f6317b80bf257 diff --git a/sci-libs/cminpack/cminpack-1.3.5.ebuild b/sci-libs/cminpack/cminpack-1.3.8.ebuild index 6314fdf3354d..a32daf6c9510 100644 --- a/sci-libs/cminpack/cminpack-1.3.5.ebuild +++ b/sci-libs/cminpack/cminpack-1.3.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="C implementation of the MINPACK nonlinear optimization library" HOMEPAGE="http://devernay.free.fr/hacks/cminpack/" @@ -13,22 +13,23 @@ LICENSE="minpack" SLOT="0/1" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" + RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/${P}-underlinking.patch ) +DOCS=( README.md readme.txt ) + +PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) src_configure() { local mycmakeargs=( + -DUSE_BLAS=OFF # TODO: pick it up if you want to -DCMINPACK_LIB_INSTALL_DIR=$(get_libdir) - -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=$(usex test) ) - cmake-utils_src_configure - use test && export LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" + cmake_src_configure } src_install() { - cmake-utils_src_install - dodoc readme* - use doc && dodoc -r doc/* + use doc && local HTML_DOCS=( docs/. ) + cmake_src_install } diff --git a/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch b/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch deleted file mode 100644 index 5133f5fcd4a8..000000000000 --- a/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt 2016-12-29 03:57:50.652989816 +0000 -+++ b/CMakeLists.txt 2016-12-29 03:58:33.882632282 +0000 -@@ -59,6 +59,7 @@ - cminpack.h minpack.h) - - add_library (cminpack ${cminpack_srcs}) -+target_link_libraries (cminpack m) - - install (TARGETS cminpack - LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library diff --git a/sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch b/sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch new file mode 100644 index 000000000000..92a9e777bbe5 --- /dev/null +++ b/sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt 2021-02-10 06:05:42.000000000 +0100 ++++ b/CMakeLists.txt 2021-03-06 11:51:15.594882519 +0100 +@@ -175,6 +175,6 @@ + + endforeach () + +-install (EXPORT CMinpackConfig DESTINATION share/cminpack NAMESPACE cminpack::) ++install (EXPORT CMinpackConfig DESTINATION ${CMINPACK_LIB_INSTALL_DIR}/cmake/cminpack NAMESPACE cminpack::) + + add_subdirectory (examples) |