diff options
Diffstat (limited to 'sci-libs')
66 files changed, 1127 insertions, 554 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex fbab1f9bf1b2..bcd680493f61 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest index ae0b6b5ac69b..94d3b25cd2a9 100644 --- a/sci-libs/branca/Manifest +++ b/sci-libs/branca/Manifest @@ -1,4 +1,4 @@ AUX branca-0.4.2-test.patch 358 BLAKE2B 087756ebe2507101eaf8c18b2726294b3eec99f7708fff092217b6083ea4f85878c2671671fb8bfbddf92822b60dbdcc737bc0eef0d46b33e1e74f00e244c470 SHA512 81d6542e259c7233e3a2c926b07cadd9fbc930db7d25f552d8febb70f3d689f57f01c49c0b6cc5e795e7fa817a7989a05a8b2768162d730b021bb6a4f2ff3925 DIST branca-0.4.2.tar.gz 59337 BLAKE2B 7d7f101a3dcc07c0210f968da2ed41f4a75177b625ce46252024da7dbba82618dbe60886c615c9461c724af76b45c7710f631bc65d5743cee7f18a2052f9db49 SHA512 cefb3b0f41d515492902ef4046cf7f10b638aca8409f5b08f201550ed5a971a441d13243b1ce38ac0b8c0f76cde1329955d26c1856e1f3c25014a6ce0d805fd6 -EBUILD branca-0.4.2.ebuild 690 BLAKE2B 73e8827c08d67736567ea7d848b72f273f20a995d292624f24856cd64bd6666baba2e3fd5f6a5d58f669c3507365bc0e724da9bca413042ea594a2d11c8c4dca SHA512 692c3d5af1abc488ce49f3566ebb7e3013508ea9657e34214a637f523a147232f009e65e1404be1e0fc028621591b803ff8035165135d3a30da197293849e487 +EBUILD branca-0.4.2.ebuild 731 BLAKE2B c53004be38829f283538bdd3dd96879589c00e0230fc1dc03d9fc046e43c60d73a67910083babdc5d73d9c0e97d5926ea6cb49d9e21f69d11febae2493383c1a SHA512 5d53b6de85d12fd62a985aed96c64aa6c79bfa3c7f7fb38c8e6eab52bac4ef7190d9dcbcedb474c12fe881423de6a1d16d6e8636507f6d60bdc024b5265dd245 MISC metadata.xml 566 BLAKE2B a5480589b81b88e433fc25420876d44f2d2c44bac5283c7b06c203d6fbe05afc46f0f17c2d35721894dc88d52686bf5a7386eeb55a8142695ec45961cf0d75f1 SHA512 fa78103653a5554470eb01f24e6c32412697c99fe9d3b1a75a18918c9fde42b649748c2bd9534af41e61f16255bd0794b86354fcd0d0f1942fb017316a2d78b7 diff --git a/sci-libs/branca/branca-0.4.2.ebuild b/sci-libs/branca/branca-0.4.2.ebuild index f536554b7301..78650db40a7a 100644 --- a/sci-libs/branca/branca-0.4.2.ebuild +++ b/sci-libs/branca/branca-0.4.2.ebuild @@ -20,6 +20,7 @@ RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( dev-python/selenium[${PYTHON_USEDEP}] + dev-python/nbconvert[${PYTHON_USEDEP}] )" BDEPEND="" diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest index db4015653f37..726f317aa22d 100644 --- a/sci-libs/camd/Manifest +++ b/sci-libs/camd/Manifest @@ -1,5 +1,5 @@ AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0 -EBUILD camd-2.4.6-r1.ebuild 840 BLAKE2B c02405546aae3b43bcfd70fa24b2ca475b3d0492fc27f4f1292a00092916f7c20a52e94d65777c3f3a236e03ccb0a350117441e299f49a469935d3871a474b80 SHA512 fa5b9796edf73cba07c9e7c1acd8bd09b12f9e74eb6a1fe30081ee46984a6c0d2b40455ce3a981d08e813e5300e5669ebc5a5b4cecee53858ccaaf01b4c09fc6 +EBUILD camd-2.4.6-r1.ebuild 839 BLAKE2B 8d3c096c6b51b4d8b7876e89293eaf21dfb907eac34665b3f8755637556f276752d51f86acd92a4283e7ec94dfe8d528f9a5fa1e736988f265da0b3364232aa8 SHA512 eb5d7db8b9ea7228537a1de51fe09e621114391e8e5a99cb0fd227f1d5c57318808c74f6bb26256163515e7b35732a6575dadbc35aff542a3bafbc056011a3ff EBUILD camd-2.4.6.ebuild 717 BLAKE2B aaea2b067e019608d3bd31ec989d25b926299da54b35fb9b60e0b9bfcd050e9c7ddddf987c9d1b36de838fd3360812d3ded619b576e4f042f9f3dc9e243b84df SHA512 3344d69aec563ab8d21a0aacdc6a14587b182bd460f4849a396ecd51fd2a2ee63bd483eddcafb12c489c23369356a3f4eeb14a7369da11d55f4d93616058c950 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild index 76e46e3b9ddf..74e087194477 100644 --- a/sci-libs/camd/camd-2.4.6-r1.ebuild +++ b/sci-libs/camd/camd-2.4.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/cdd+/Manifest b/sci-libs/cdd+/Manifest index ff600fbc237b..5667afeec722 100644 --- a/sci-libs/cdd+/Manifest +++ b/sci-libs/cdd+/Manifest @@ -1,7 +1,8 @@ -AUX cdd+-077a-gcc-5.patch 369 BLAKE2B c213d0c13c779c02846f0c3e005265ba696a82619f3690242743eda6fa8203ac2c5df4e7d5f0e9c0972f37a6de955a9b55f6aa76fda3c4fc8b80f875afda70a5 SHA512 36804d2cf1f8ac137b2ef5b1991e5e73a2ab40f8391a813f07b3d1ba6d5556bf852f07f25567a3696f9c1fa5927ef23f3364125af50136d0954723fee8d80059 -AUX cdd+-077a-gentoo.patch 1141 BLAKE2B 6b4a63e53e7a892df25eff22a198aecbed3e9b9987466e9662959f9cdcd9abf37e9a3a3e25f2c7e61cbf1c49e778b1a3ab4141f6ee2be89ccc2bae99246f1d85 SHA512 7b05ac66c6b4205c5434dc63ca46f2fbd88c115fa3bdae92ad8014fe5c70daf256b24ec1d7a0f7697e78868f78afd3ea6d5e23ed294433c2507fd8b1be510e61 -AUX cdd+-077a-headers.patch 1993 BLAKE2B e9659821dd75f7202be84ed7384a4123e96ab50f5e45ec59724c39aea7c820417022abf2b15e2b1a60931be4a31c5e92857df83758e9dbbe54d11e328a0b75ba SHA512 8b141789efea76eba1256c0f9c882dc7920169c39b80040f8c7a0238cede399b69094cf3352b26c3996d0d9ced650c654cb12d07996d0c6466a7efa1069e609f -AUX cdd+-077a-qa-const-char.patch 1469 BLAKE2B fe9afa62b86a0d43eea6b5652599f064905c3815d2a732eb4536988751c06c5e3fc795839c2d2cbc6eb61fc8beb2aa1faf7c1bfa51118fddd2b225970762641e SHA512 fb9165442197cdbe5c1994d1759eed4c7948ce2fd89dc15b10012684be5749e9cdff548d0809f7dbf6f07141d608b71f990c10d4fbe089c73abeda8519158ab5 +AUX cdd+-077a-gcc-5.patch 353 BLAKE2B 3c37c431e1dbfbcaefed3b8df952e731ee45d63fca4c6bb83f60177fbdc9a18f4299145a7ac2af3821929e54d338786a12aabd8a1fbe1f4d26467a78e67f6d34 SHA512 04f955b92344d7e2f0a9686b014ab11e776e347388fed169641953c594e5556374d9b169c493cb19421adf96ef479a121e4f46b2632e4e43656abe420a8741e7 +AUX cdd+-077a-gcc11-dynamic-exceptions.patch 1955 BLAKE2B d84de845adc66fe4e66b345764a6652fbdc89c76c5326fac4e867976c40c50557d5dae13dad096868f80fa815149f70ed6540e456db68af379f8037821093106 SHA512 053e55dccc31a4e2284d8c929401530c8a1d04516ffef834b4ee4bf9c71e99341e353b47e954b3f44407a24997d7ec7ea4aa018ac34668e1c115d714db0ca181 +AUX cdd+-077a-gentoo.patch 1068 BLAKE2B adb0a66750309896dd58309e39b42cf982d3864c03f919f83905c09d74d118e171aa647a71d38a65f6a67acceaa81444d9fd65d55690d5da406ee72eb95e5a64 SHA512 7213b26439a8a555eba25563d7396fbfc444426480675721503fabebe96418f05b0277479c7450dfbc75fd1e51f4d5841611d7fd3a76179119c084cd35db634f +AUX cdd+-077a-headers.patch 1066 BLAKE2B 4d63d96fddb9e265d28e66371dd3a8656cbfb0b4d13338912f88220e29bc90488d4b50afca581d192559c36c134bc0755ab1e02fb6b900eed0734aad5eac395d SHA512 462f6a11a2cc27df264d93432088fb5abb998c759e08b6bf12121336ae77a9a33702f7169971926bf9feed8fc3bf6f5b526c7ffcfa9f1e12b72a238d9aac8d4c +AUX cdd+-077a-qa-const-char.patch 1437 BLAKE2B 5d6a347f6c8c2ee7c03612849454aa4134bb4ae41272bc6cbf1420ebebadb6dd68c5ba19973e5252d0b9badd9d90275dca78fa8cc56631395688f93e85d27754 SHA512 5ab7d38beceb21527e2c3daf889a5bcb93eb537b2a5b39f6a1d9781ddb36e3366600ce97717558c7dbf548b075c7280c474388809d37c9ab7391069e7b3839a7 DIST cdd+-077a.tar.gz 186771 BLAKE2B 1bc1ae864c83da4f2c2d421c783f484933ee9625bf16d299a65ae738cb218e670453b661e9914776d6fc0766503a44f345c4cdfaea834120c79e677bb5686b46 SHA512 cb151274adec502420e5e931d2f248d62b26d5797f7d55f6db9c947f8e9d715a864c88ad08ad2cd74ada237789de5ca3c49dc04dc55e63d4101f07cc1685ab12 -EBUILD cdd+-077a.ebuild 852 BLAKE2B 067bb02142b588a6cd5855c330a5b3207784903490389dbe03a3ea913d9e94abe6fab2478436c32c90a661dc00907c94e82c20d10c0e4fae143b87916c748fa3 SHA512 bdb20e049558dfde9b40c9b810a52603436bbb5b75030d378beb0fdb66c27c2a2e54aeab7d4ae8c2b3aade5eef527387fb51ce9c5e880311e39942030e2386c3 -MISC metadata.xml 661 BLAKE2B 281640e5f49b4c8512384dc9f2a48996d96a6e91f7a85bde3510ae7808698fbc09be72d8997e37f8b27065fd9f5696384aec2880b5224d060727aba9f21e727f SHA512 cefc0b38a9d11cd66ef0646a3bad907d3fc4d78aa6cf24e594efd40b8114293c94255c3fea1bb54f66f5e1beeb6a732fe1809ffb62d4528ef3f63b6f7e4a73e8 +EBUILD cdd+-077a.ebuild 854 BLAKE2B f7189d0b866de1eac79af31782f71a86bb6c76bdfff026e3e9e5adcb2440627dab925e2bd2536a31acd6e07490959b8c5055e403a32bcd0f2845416753d9ce5c SHA512 4d22b9838d6c4809f32e864bb4119849eec35572bf109857e12df5e2d6f2a4ad5fd04f5d6eb71ec2864037ce27963dd214e5e3aeea36cb6bb155057c405095c8 +MISC metadata.xml 723 BLAKE2B 68b9f97d2373aafafaf1b63d834d649dd5aaf8fd0adbbe1642ed3e819769b1b569c7d658d52905b04e880ed03f40bdfb5f921bac212e1a56e756e47296ed87e3 SHA512 a6c58e4cba4852ff383be3a15d8e9bcf8621827679e02a9ce18509d816a9e286e895e8d4d5e7be68468cab815481db653fa023be89cf72a77123173f77ab5c3a diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild index b0f5d66efdd8..12930c685aba 100644 --- a/sci-libs/cdd+/cdd+-077a.ebuild +++ b/sci-libs/cdd+/cdd+-077a.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit epatch multilib toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Another implementation of the double description method" HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/" @@ -12,27 +12,25 @@ SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="" DEPEND="dev-libs/gmp:0=" RDEPEND="${DEPEND}" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-headers.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-gcc-5.patch \ - "${FILESDIR}"/${P}-qa-const-char.patch -} +PATCHES=( + "${FILESDIR}"/${P}-headers.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-gcc-5.patch + "${FILESDIR}"/${P}-qa-const-char.patch + "${FILESDIR}"/${P}-gcc11-dynamic-exceptions.patch +) src_compile() { emake \ CC="$(tc-getCC)" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - GMPLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - GMPINCLUDE="${EPREFIX}/usr/include" \ + GMPLIBDIR="${ESYSROOT}/usr/$(get_libdir)" \ + GMPINCLUDE="${ESYSROOT}/usr/include" \ all - } src_install() { diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch index cd2d32a8a31b..94018d6da2a6 100644 --- a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch +++ b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch @@ -1,8 +1,8 @@ Fix check for GCC version beyond major version 4. Gentoo bug #569222 ---- cdd+-077a/gmp_init.cc -+++ cdd+-077a/gmp_init.cc +--- a/gmp_init.cc ++++ b/gmp_init.cc @@ -31,7 +31,7 @@ # define pm_gmp_reallocate std::__alloc::reallocate #endif // gcc 3.3 diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch new file mode 100644 index 000000000000..1ac5a0cef32b --- /dev/null +++ b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch @@ -0,0 +1,71 @@ +https://bugs.gentoo.org/787941 + +From 46d95aeac2d3951d79291def284bb610e7cb033f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 5 Aug 2021 02:00:33 +0100 +Subject: [PATCH] Drop deprecated C++17 dynamic exceptions + +--- + Integer.h | 6 +++--- + Rational.cc | 2 +- + Rational.h | 2 +- + cddio.o | Bin 0 -> 154584 bytes + 4 files changed, 5 insertions(+), 5 deletions(-) + create mode 100644 cddio.o + +diff --git a/Integer.h b/Integer.h +index 8b7f04e..d4a1bdd 100644 +--- a/Integer.h ++++ b/Integer.h +@@ -179,7 +179,7 @@ public: + } + + /// Recognizes automatically number base 10, 8, or 16. +- Integer& set(const char *s) throw(gmp_error) ++ Integer& set(const char *s) + { + if (mpz_set_str(rep, s, 0) < 0) + throw gmp_error("Integer: syntax error in string"); +@@ -195,14 +195,14 @@ public: + + operator double() const { return mpz_get_d(rep); } + +- operator long() const throw(gmp_error) ++ operator long() const + { + if (!mpz_fits_slong_p(rep)) + throw gmp_error("Integer: value too big"); + return mpz_get_si(rep); + } + +- operator int() const throw(gmp_error) ++ operator int() const + { + if (!mpz_fits_sint_p(rep)) + throw gmp_error("Integer: value too big"); +diff --git a/Rational.cc b/Rational.cc +index f1b86a4..c679671 100644 +--- a/Rational.cc ++++ b/Rational.cc +@@ -19,7 +19,7 @@ + #include "Rational.h" + #include <cstring> + +-Rational& Rational::set(const char* s) throw (gmp_error) ++Rational& Rational::set(const char* s) + { + const char* digit=s; + while (*digit && *digit!='/') ++digit; +diff --git a/Rational.h b/Rational.h +index acaba13..eb30578 100644 +--- a/Rational.h ++++ b/Rational.h +@@ -421,7 +421,7 @@ public: + Numerator and denominator are expected delimited by `/'. + Omitted denominator assumed equal to 1. + */ +- Rational& set(const char *s) throw(gmp_error); ++ Rational& set(const char *s); + + Rational& operator= (const Rational& b) + { diff --git a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch index efe6d7035e99..b61b8ab42a0b 100644 --- a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch +++ b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch @@ -1,5 +1,5 @@ ---- makefile.orig 2010-01-19 20:22:59.000000000 +0100 -+++ makefile 2010-01-19 20:52:01.000000000 +0100 +--- a/makefile ++++ b/makefile @@ -6,21 +6,21 @@ #CC = /bin/cc diff --git a/sci-libs/cdd+/files/cdd+-077a-headers.patch b/sci-libs/cdd+/files/cdd+-077a-headers.patch index c6ceb93bfaad..4df6f05871c9 100644 --- a/sci-libs/cdd+/files/cdd+-077a-headers.patch +++ b/sci-libs/cdd+/files/cdd+-077a-headers.patch @@ -1,10 +1,5 @@ -Index: Integer.h -=================================================================== -RCS file: /home/imocvs/cdd+/Integer.h,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 Integer.h ---- Integer.h 2008/12/15 01:19:52 1.1.1.1 -+++ Integer.h 2008/12/15 01:24:04 +--- a/Integer.h ++++ b/Integer.h @@ -23,6 +23,7 @@ #include <gmp_init.h> #include <cctype> @@ -13,13 +8,8 @@ diff -u -p -r1.1.1.1 Integer.h class Integer; class Rational; -Index: Rational.cc -=================================================================== -RCS file: /home/imocvs/cdd+/Rational.cc,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 Rational.cc ---- Rational.cc 2008/12/15 01:19:52 1.1.1.1 -+++ Rational.cc 2008/12/15 01:25:14 +--- a/Rational.cc ++++ b/Rational.cc @@ -17,6 +17,7 @@ #include <cctype> @@ -28,13 +18,8 @@ diff -u -p -r1.1.1.1 Rational.cc Rational& Rational::set(const char* s) throw (gmp_error) { -Index: Rational.h -=================================================================== -RCS file: /home/imocvs/cdd+/Rational.h,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 Rational.h ---- Rational.h 2008/12/15 01:19:52 1.1.1.1 -+++ Rational.h 2008/12/15 01:27:08 +--- a/Rational.h ++++ b/Rational.h @@ -17,6 +17,7 @@ #define _POLYMAKE_GMP_RATIONAL_H "$Project: polymake $$Id$ @@ -52,13 +37,8 @@ diff -u -p -r1.1.1.1 Rational.h *den_buf++ = '/'; denominator(a).putstr(os.flags(), den_buf); } -Index: gmp_init.cc -=================================================================== -RCS file: /home/imocvs/cdd+/gmp_init.cc,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 gmp_init.cc ---- gmp_init.cc 2008/12/15 01:19:52 1.1.1.1 -+++ gmp_init.cc 2008/12/15 01:23:45 +--- a/gmp_init.cc ++++ b/gmp_init.cc @@ -16,6 +16,7 @@ #ident "$Project: polymake $$Id$ diff --git a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch index a2304725990f..883b6bf809ba 100644 --- a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch +++ b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch @@ -4,8 +4,8 @@ cddio.C: In function ‘void SetWriteFileName(char*, char, char*)’: cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings] extension=".ine"; break; /* output file for ine data */ ---- cdd+-077a/cdd.h -+++ cdd+-077a/cdd.h +--- a/cdd.h ++++ b/cdd.h @@ -185,8 +185,8 @@ extern int output_digits; /* Float digits for output. Does not affect the computation. */ @@ -17,8 +17,8 @@ cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*â myTYPE FABS(myTYPE); void SetNumberType(string); ---- cdd+-077a/cddio.C -+++ cdd+-077a/cddio.C +--- a/cddio.C ++++ b/cddio.C @@ -90,10 +90,10 @@ } } diff --git a/sci-libs/cdd+/metadata.xml b/sci-libs/cdd+/metadata.xml index 1745610437d5..e793c504506a 100644 --- a/sci-libs/cdd+/metadata.xml +++ b/sci-libs/cdd+/metadata.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> - The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all - vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear - inequalities: P = { x : A x <= b } where A is an m x d real matrix and b is a real m dimensional vector. - </longdescription> + <maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> + </maintainer> + <longdescription> + The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all + vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear + inequalities: P = { x : A x <= b } where A is an m x d real matrix and b is a real m dimensional vector. + </longdescription> + <upstream> + <remote-id type="github">cddlib/cddplus</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest index 7cb03fb408ca..6e1c1cf46fea 100644 --- a/sci-libs/ceres-solver/Manifest +++ b/sci-libs/ceres-solver/Manifest @@ -1,3 +1,6 @@ +AUX ceres-solver-2.0.0-system-mathjax.patch 325 BLAKE2B a649088517ec1bef7d5a6144de57657daeff2b5a1a0b053c0bfa81d8af7143ad5d829571be947d8853bd6d1fe39adc63b4f14a4075004775151fa649747911c6 SHA512 e16646210fddb350f5cc43665afaa88d2ffe53c817dab778c0e2534c1a0001242865a547e8a308621a9068555e7e20a57e83b0447ff5d32688ed5fb3f5694d29 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6 +DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0 SHA512 843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9 EBUILD ceres-solver-1.14.0.ebuild 2390 BLAKE2B 6aa1716982173734e1f95f2ba76b18ae27854811c35d95f8b2812fd6ff7ff1b74adb7c4f674e4834b5ee65e1a5a159d9cd656d28a9fbdda6192da84060150e8c SHA512 1e8da4d8abbfe6705841a453a9db6e5d672c40efff438afe32085b7ad43b7801970184d1869726ce9ec28b32e6c076f84a7fa622417b88bcd9f7072602bd235a +EBUILD ceres-solver-2.0.0.ebuild 2524 BLAKE2B a3fdcf279d57e9d69a0ac3f3d6639f1e0ac84c1116628da74dd80bb77271ade03ef3be70cc88efa2e0b8c4d1faf1dd77bc3a061f0ef05c62f9f4d3219d92d3f4 SHA512 e430efbf26696b97e619045463da032b376811d999fd394d9e3c51301e7db7d29217452df27e716ab9de1cda2c033301b505571ab362dc8aaa541d8f955cb1be MISC metadata.xml 1451 BLAKE2B c23657557890c4b62551c79eb7a3b07ef0921f5766b9d771d85e1cf156b03a9d783f6d307504ce5cfc810e096bd990f2aef58f7da6cf912df3fbafa7b63f257e SHA512 e9867b3e997e1c28e900f1148287ed052d5e29440c7f8d99b61432c8870d8f6d7368d387f9cc72bb948a412b77ad8e4cc2f418c41ad60f21c8027e23f36d71aa diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild new file mode 100644 index 000000000000..771ac309e41c --- /dev/null +++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{8..10} ) +DOCS_BUILDER="sphinx" +DOCS_DEPEND="dev-python/sphinx_rtd_theme" +DOCS_DIR="docs/source" +inherit cmake-multilib python-any-r1 docs toolchain-funcs + +DESCRIPTION="Nonlinear least-squares minimizer" +HOMEPAGE="http://ceres-solver.org/" +SRC_URI="http://ceres-solver.org/${P}.tar.gz" + +LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )" +SLOT="0/1" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cxsparse examples gflags lapack openmp +schur sparse test" + +REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )" + +RESTRICT="!test? ( test )" + +BDEPEND="${PYTHON_DEPS} + >=dev-cpp/eigen-3.3.4:3 + lapack? ( virtual/pkgconfig ) + doc? ( dev-libs/mathjax ) +" +RDEPEND=" + dev-cpp/glog[gflags?,${MULTILIB_USEDEP}] + cxsparse? ( sci-libs/cxsparse ) + lapack? ( virtual/lapack ) + sparse? ( + sci-libs/amd + sci-libs/camd + sci-libs/ccolamd + sci-libs/cholmod[metis(+)] + sci-libs/colamd + sci-libs/spqr + ) +" +DEPEND="${RDEPEND}" + +DOCS=( README.md VERSION ) + +PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" ) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then + ewarn "OpenMP is not available in your current selected gcc" + die "need openmp capable gcc" + fi + fi +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # search paths work for prefix + sed -e "s:/usr:${EPREFIX}/usr:g" \ + -i cmake/*.cmake || die + + # remove Werror + sed -e 's/-Werror=(all|extra)//g' \ + -i CMakeLists.txt || die +} + +src_configure() { + # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF + local mycmakeargs=( + -DBUILD_BENCHMARKS=OFF + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_TESTING=$(usex test) + -DBUILD_DOCUMENTATION=$(usex doc) + -DGFLAGS=$(usex gflags) + -DLAPACK=$(usex lapack) + -DSCHUR_SPECIALIZATIONS=$(usex schur) + -DCXSPARSE=$(usex cxsparse) + -DSUITESPARSE=$(usex sparse) + -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3 + -DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS) + ) + use doc && mycmakeargs+=( + -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} + ) + use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON ) + cmake-multilib_src_configure +} + +src_install() { + cmake-multilib_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples data + fi +} diff --git a/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch b/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch new file mode 100644 index 000000000000..61e0f000f267 --- /dev/null +++ b/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch @@ -0,0 +1,10 @@ +diff -urN a/docs/source/conf.py b/docs/source/conf.py +--- a/docs/source/conf.py 2020-10-25 22:25:47.000000000 -0500 ++++ b/docs/source/conf.py 2021-07-29 09:44:35.488893188 -0500 +@@ -252,3 +252,6 @@ + 'scale' : 90 + } + } ++ ++# Use system MathJax ++mathjax_path = "/usr/share/mathjax/MathJax.js?config=TeX-MML-AM_CHTML" diff --git a/sci-libs/coinor-bcp/Manifest b/sci-libs/coinor-bcp/Manifest index f11f4dfc112a..2b6e7ecdf7c7 100644 --- a/sci-libs/coinor-bcp/Manifest +++ b/sci-libs/coinor-bcp/Manifest @@ -1,3 +1,4 @@ +AUX coinor-bcp-1.4.4-gcc11-exceptions.patch 1424 BLAKE2B 72b2890a23f15cbdfc868b9b82d9a315a7439571e9518b1fc61aa6e84f89ac199e2ff1847f3051121f7ac18dbae3dd654d4fdd7a52daa6bed3c2d9a1cef59562 SHA512 53a0010025e92c5bf099aa475fa913550723cdce99e5e46f9f96071c71e7854f896f6d26a8c3627c4ff196053b56de97ede0cea654a4df728de004846781ffa9 DIST coinor-bcp-1.4.4.tar.gz 1983573 BLAKE2B 79265c0336ca719b417825df2f27e88c08c314e599693e8886170fe69755b3272aa05469bfc069660c979e4a273ca63a25fc4d3a86a695838039121fa98a14bd SHA512 066ad631a67ccf33eebc175451f4734cbf190cb4fd9866dec987d80688a69400b76415de65ee9399b1a8ccfdf3bf3af307245610481a6d673598bc157c3963bc -EBUILD coinor-bcp-1.4.4.ebuild 1286 BLAKE2B cacfeb014ef35c6c25d7296bce2bb975d686a1ae1ee79fba63ff3f20734283aa2b597a25994ddde5083de9a9b1b74eecb8a90de77c88a24593b7c18a323918db SHA512 6a7e1253bb1635ac0811c64162a915c5ed15d4868d561cbcbdcdd5183145e87799a6c5204136eb3303080436e2039e6552cd1e6a9cddcaf87df9c26c901f7600 +EBUILD coinor-bcp-1.4.4.ebuild 1342 BLAKE2B 3604cf8bdb00449d1f6efd365f12ef0b5d8bc21f028d8ce928c5bdde5e42a01806a40f7b47d45669f698bc2688a03b6af6e99c847b341e53557ae7cdabf3e264 SHA512 8261262187cbfa0433dc025348cfb346e31b6ca262e34e0514a3f185e29be8526a1ce85fac4dc196e4318bf13c6fb4117d62fdd9930569076efb7210d8013d13 MISC metadata.xml 754 BLAKE2B 42bb77241c68a9f2e81c4a50350fd25d42ccbab57cefc743ea0eea119b6ef530d512c89fcfc598a1f0b5ddb67ae8477c93cb61b7bddd7c242bff20acff4c57d3 SHA512 9dc6b85158dfe5ccb8820338f45c8ee1b1b7ce926ec7a41b3dae25210b99de72b87d8560e7f4a1a0772a35f5cabc2fa261fc0044e0d4c5c826f0c61034b8b6cd diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild index b4b5f58fbe9e..a904acfd1336 100644 --- a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild +++ b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild @@ -25,6 +25,10 @@ BDEPEND=" doc? ( app-doc/doxygen[dot] ) test? ( sci-libs/coinor-sample )" +PATCHES=( + "${FILESDIR}"/${P}-gcc11-exceptions.patch +) + src_prepare() { default # Prevent unneeded call to pkg-config that needs ${ED}'s in path. diff --git a/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch b/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch new file mode 100644 index 000000000000..d37e8b024396 --- /dev/null +++ b/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch @@ -0,0 +1,36 @@ +https://github.com/coin-or/Bcp/commit/e581a2dd4b55352eb318c15e8281b3cc9d8abe23.patch +https://bugs.gentoo.org/786306 + +From e581a2dd4b55352eb318c15e8281b3cc9d8abe23 Mon Sep 17 00:00:00 2001 +From: Julien Schueller <schueller@phimeca.com> +Date: Fri, 14 Aug 2020 09:58:47 +0200 +Subject: [PATCH] Fix deprecated dynamic exception warning + +warning: dynamic exception specifications are deprecated in C++11 +--- a/src/include/BCP_buffer.hpp ++++ b/src/include/BCP_buffer.hpp +@@ -101,13 +101,13 @@ class BCP_buffer{ + /**@name Modifying methods */ + /*@{*/ + /** Position the read head in the buffer. Must be between 0 and size(). */ +- inline void set_position(const int pos) throw(BCP_fatal_error) { ++ inline void set_position(const int pos) { + if (pos < 0 || pos > size()) + throw BCP_fatal_error("Incorrest buffer position setting.\n"); + _pos = pos; + } + /** Cut off the end of the buffer. Must be between 0 and size(). */ +- inline void set_size(const int s) throw(BCP_fatal_error) { ++ inline void set_size(const int s) { + if (s < 0 || s > size()) + throw BCP_fatal_error("Incorrest buffer position setting.\n"); + _size = s; +@@ -221,7 +221,7 @@ class BCP_buffer{ + */ + template <class T> BCP_buffer& unpack(T*& values, int& length, + bool allocate = true) +- throw(BCP_fatal_error) { ++ { + if (allocate) { + #ifdef PARANOID + if (_pos + sizeof(int) > _size) diff --git a/sci-libs/coinor-couenne/Manifest b/sci-libs/coinor-couenne/Manifest index 43c0218ff534..88f04d05385f 100644 --- a/sci-libs/coinor-couenne/Manifest +++ b/sci-libs/coinor-couenne/Manifest @@ -1,4 +1,4 @@ -AUX coinor-couenne-0.5.8-fix-build-with-gcc11.patch 1497 BLAKE2B edc1886a22c886a667181b42bd8d764f368af22c424a96d326a878104a01600a7b1f155c6a0ae66ccd0b09df39a44d8e6e6acb02ead8cd8c359cd7e173b02463 SHA512 f5a2b371129b5e50567d06794a4907cfc64c688518f931518b653159929c322ec070298d66e45d7443cd9af1cb394d9349b5a8322aa23f4bdb0eff2e3fb1bd9a +AUX coinor-couenne-0.5.8-fix-build-with-gcc11.patch 1649 BLAKE2B afc60f6ab29aa4e1534fcb1eb30642319f25b8409d585da03041909531f27f1b7eccbaadcd1c1f08f6b563f2cad85d5a06973de7c6d756562482d15680244326 SHA512 4511028eecb450a363f0bd23301d4e903b8f7f9cb7314aeb1da63f7b257a048a626e853900e191afac81030b5fe40418d37d907a9cd892b220adc400a2e7c87c DIST coinor-couenne-0.5.8.tar.gz 1321163 BLAKE2B 841a4af3d76fd308ef5abe481157fa1ecf307e7fae03fa0cb931483be74443febc7eb1ba7e85f47c3dca5d5447a74ae86dc0f3dbeb6c0f0032f543861462e0a1 SHA512 bf474503bd77be6536f9d00b40ff45041b3976ea2167d64e667fa580aa8ed6a383861ec67d57eec83623b6542f7779ed7d50d9b72347c3f77ef36a194a3f9e71 EBUILD coinor-couenne-0.5.8-r1.ebuild 1314 BLAKE2B 18b8c8fccced626330a6aabd72c1f1656951c8710a6f85a1481e6f50caedbaef664b4ab5a30daa7adbd9950281810e3db2af95d4f4b5c0bc8f5c359184905b88 SHA512 b3f67f357dce7aa682eb1684ae18012aa76f7868cdf98aff457489ec31b9b9906d2068e92962cbe57a924f9893f95fa51a89adaccab6cda7585240033ade0f50 MISC metadata.xml 700 BLAKE2B 945c3aafd3cc6b2280c64b664cc9a49ccc5be8b9d6dd33c4bb4730c7367e1ad15b25f9fefb968b69f29f2b5cf1e57d8cae3f990db8948d8436385bea67e34212 SHA512 641fa4e5a9bd4f66e42aa86960141e3de0d8f68bc9b01d8235a6be90c1b2c60a262221b0253a366491ed161b8acf114df8549affbc30acd250b89ca3d65105fc diff --git a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch index 339ce1a0e903..7cae89c1ada8 100644 --- a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch +++ b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch @@ -1,3 +1,6 @@ +https://github.com/coin-or/Couenne/pull/57 +https://github.com/coin-or/Couenne/commit/fdfe17562c59518b4db478ca51c18ab5e01a59a5 (later found post-patch) + https://bugs.gentoo.org/792798 From debc5de2d0ac9654c01db080448df064b808c56e Mon Sep 17 00:00:00 2001 diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index ac4699e90609..2c5cfa1aad5d 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -8,5 +8,5 @@ DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e392662421852 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5 EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713 EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf -EBUILD gsl-2.7.ebuild 1461 BLAKE2B b8ba4ef7b9bd8c2485750c9a26ea778f0a913a0a6c2e67be34d5deaaa0a7349299e216ed2635681b4f46e489f76600a2f406e31a255bf3b876bbb6b1b734b0f9 SHA512 f1c8fd6ac5b35ae6854745d33c51af2066f72ebacd1ab49f52109a7362a47d8b3804ccf7ef3def69df91eceea1056b26e28a436b4af72c70255842d3645ca0bc +EBUILD gsl-2.7.ebuild 1459 BLAKE2B de1eafceae45af3c5a051be50cbb54afdc34fe2610f18b08c7eedc92c8d7d3aeb43016d2531cbb99649d00f47157a3ec3569ee4b81360aad2db99720a0095c10 SHA512 788fca8c7a6768938c1c6b3bea5f48f16194b49fbbf992489e0250d205ab19160ac6000fbf7dc93355e456339515b225aa15d8af788de7ddd2850760f72f6c5b MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00 diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild index 1819cb8629de..247d2fe2b638 100644 --- a/sci-libs/gsl/gsl-2.7.ebuild +++ b/sci-libs/gsl/gsl-2.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3" SLOT="0/25" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" IUSE="cblas-external +deprecated static-libs" RDEPEND="cblas-external? ( virtual/cblas:= )" diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 925711eae626..414b70346f5b 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -6,5 +6,5 @@ DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297 EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38 EBUILD indilib-1.8.9.ebuild 1189 BLAKE2B 60b9a949b599b8a1a9772355a68d9257501a85eb1d6155e95afc0c7766ad13564e77e669f6341377674c0b5cd5886649e402944dedee06fe975642132a48add3 SHA512 96428f3be5dafea90c4ce14da7dae749c6124bd3824500928f3f25c89c4c26dd054b07e3536f9db30140d7a539775148f7fa9da739b0ff4c2da5fa22651cdc68 EBUILD indilib-1.9.0.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05 -EBUILD indilib-1.9.1-r1.ebuild 1334 BLAKE2B da82a5c7dd9e8a8b1a8dfdecce12f22b39cdf0381eef94be46e836fc63071fde720c325151d531f317133439525b13ae732ab0497b32bdcd8d400442a1700a55 SHA512 0632e5a82020334e961cd4e1d500f4f94dc76f37a336474c9d03797dd92da1828764c976f137ef392422b880963cdcda4bd6df6baa7a4b5c31cd7264dabb2dcb +EBUILD indilib-1.9.1-r1.ebuild 1333 BLAKE2B 336899d9f2357e3ed1b021b6e53b259ba2c44647d89760c4c99f7af3f83e5498341147519f98181baa8db24b1a480bcfa7e00ceaa429d0de0a783a1f30d3e0c1 SHA512 a0e9e8ff4290994004e577d77dd5e77f2b02717cd9de435810b8f588fcc3700907b4996d0373d42d021bdfc1d0bf79be1d2bdbab5b2eeb92a826be5678cd5434 MISC metadata.xml 561 BLAKE2B 08059ed028ee0f961a58fe6e8ba141160437cee5e944bc72ad82a5731b0f187cd412ea2669a2d726d7c602a0dc8c659a79672f0e3786f502db22754076498854 SHA512 c0f2d64008a0ea23319101a2ca7e928940c81a6959544410476f80482cc560e42c991228ec96a1f8eab7d333f22a8853a40162228953a6dad6e5cdb67e8f3d7b diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild index c67a2b8eea54..be99265cb352 100644 --- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild +++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest index c701b185873d..c7233599d6d3 100644 --- a/sci-libs/libint/Manifest +++ b/sci-libs/libint/Manifest @@ -3,5 +3,5 @@ DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e7150 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef EBUILD libint-1.1.6.ebuild 855 BLAKE2B 65e5b86aa9e9b8a29825c7075145b4ad170c9a6bd255773e605a826476a54e3ec4734194362a53d74c95b3916e98ab7343ac5b94f4defb2a6cad0c42c55077a0 SHA512 ec5cc40c2c27cf812cca7d843461e5568f2596970ef80912e3c8cfab2cc70b0a5179c680c63a7d8df84d8d38bfd3e43dfad035ac4b43bf587ef81738d0e84274 EBUILD libint-2.6.0-r3.ebuild 1422 BLAKE2B 5a95126604bd6e1e9f7b697fd542a0ee74a24b539d5ec367d2fcb833ec70481305869cbc18e6bdcb23692f5fe39467cf53d5264353ae854530cda4cda3de98c5 SHA512 0b2e7980ed09840a83659640df1ad32803d3975e419926958d5d75eb0fb8e7d2ca207093727b68b89419065c51c1c46dff268d833e897c1d5a4c827c90fc1c31 -EBUILD libint-2.6.0-r5.ebuild 1598 BLAKE2B d3efe5f6bb2e2304cbb07eb1de390d5b596cb4dbd4e34e4716a468345cbf72c0bc7b71dc714a66383304ca6a17a4f7c232450c7d989b1d8e9c571ac10ab24f90 SHA512 ace5668a85735297d2f7e835de962e3e3c4c84f0c6ccb3f8989e9e3fc53a0d84fad5320ba3dbab00e1d70ded7e909e0c8afbcf60d5332979dd000154f88bc3db +EBUILD libint-2.6.0-r5.ebuild 1597 BLAKE2B b5ba23f8101470e970a1a65bf7c70650c3144520ac798d9c41286b1e97cb296519af05d312cde7f015b4164997921db78e94c869b51a8700016be2e2281894f9 SHA512 f4409edfa07a47c1c629b2a48bd3adf9c280e634a5d6d995d40f8be0007730ec70a6e7fb39cfde6ed019a96c1240fa9fc5c75107487006bd3fa23ca1cf215264 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0 diff --git a/sci-libs/libint/libint-2.6.0-r5.ebuild b/sci-libs/libint/libint-2.6.0-r5.ebuild index bbf70b01e2ba..176c1000db5f 100644 --- a/sci-libs/libint/libint-2.6.0-r5.ebuild +++ b/sci-libs/libint/libint-2.6.0-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="2" LICENSE="GPL-2" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="static-libs doc" DEPEND=" diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index 19d7b4d1d5b9..73d7043e31ee 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -4,6 +4,6 @@ DIST libqalculate-3.19.0.tar.gz 2007385 BLAKE2B bd0b1bbfcd4bad0053ec9193bec1081c DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931 EBUILD libqalculate-3.17.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469 EBUILD libqalculate-3.18.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469 -EBUILD libqalculate-3.19.0.ebuild 1604 BLAKE2B 742061709594aff32c619af31ed37f9741c71c59e015415ed3a2cad9e3b491c3f8546fd54d8db3bdb66b60f5d1e0fef71fc407bea2fd9ac7a34c851262ef414c SHA512 f85aa53889d88ea0e6cfadabdafdc5bfb6681452351e8adf9e740561831ad0ac9ed1a228be82e82a4e4a08c39f3f9e7c736c5d91bd9f9bf0471301608ad27608 +EBUILD libqalculate-3.19.0.ebuild 1603 BLAKE2B a503ff3c6842ce2c20340e3783eda16ec0071151adedb157402df9c6ef0051afdc36ba03482d3b7edd8543c77c77d254b6fe6745ade186eff54f0be9cb9fa25f SHA512 f417057b5dc28dc540b2ba858e6219484d230e2a5a94416b67bcfb2670f09e144f09a3249f6a104eda529cd2c6a710ab9a0e6f935477f3d8731eb7adf4695790 EBUILD libqalculate-3.20.1-r1.ebuild 1608 BLAKE2B 527c1abfaa8d29f92f178d63c8898ec26affc870a830cfe7c26bde6f76fd9b900457822ec148a8aef32ef23d51ffc5aa0f89b96549c587e699e3ef2179f35f7e SHA512 dd7b56e849de9713540e1c449f09f982b5042e7210d8b4612d4ead5bf29646ffc7343d8400fc60f681ff37e5cb457bc84ea1af4289d37877581db02d07f4e328 MISC metadata.xml 412 BLAKE2B bec97c9946830a88d871c0a27f06ff42a2ed252971f616f43f4c0cfa9617ea46565153c41c2aabea921b694c6a665a097635fdcf5dd82387dc60445e14657427 SHA512 3e011ceae845d6f233e86f7d39eb4460f561720312d8a0696b87672251cf46138228ae678ab63459280dd36fda3f9f8f302d9259e49acd6606fe2e66126bffb9 diff --git a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild index b1e1ab831657..aa63a8ec0a91 100644 --- a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz LICENSE="GPL-2" SLOT="0/21" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="curl icu gnuplot readline" DEPEND=" diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index 9ba04972ac8b..4b846c45e5c6 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,10 +1,7 @@ -AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940dc5b0bc130b87dc7fa357f91fffc3deb8316ecd1f3f504b578cdf105b533772e8ba9ec34f4410960721ace1ac7e5fba3a04a65 SHA512 51c417011b481712d3469fe86591c903e16cce2c06b83cc7e3ee663d75ad4910b60f8893f589fdd6a38282e1668a1f97d93c50fc360a5919379dec5520a8905c AUX libsc-2.3-add_soname.patch 479 BLAKE2B 3e7e199f88160dc7d5af67696d1a1b1cb2d668589e5a219adcdb6791879e1370f3f638d546b915a4cc40bc5fa594a4e3dd927d31e735dfb287d95ffaa4e6e897 SHA512 d8460b4b1ddb790903f7ddf053f5cb1eabf74741a10a79784a2764b756f82e7c160e6e6752c01eeb4cca2e2e99316c0b2b0f3192bf4415685523abdf71dc1065 AUX libsc-2.3-autoconf_lua_version.patch 1790 BLAKE2B 7968b643acddc54f81b06028392ee328143f280178ed4a52e4a7eabc85906f043b9edd82cf7c0ef7c4956cee59602bb231e0051da162538419de3b9b88c7a57d SHA512 6c3c183b5255296ac0340845b94d39e6aa1f4675a6fc44ea139635e73aca7a4d8eb02d14a7e9599723ca9d0702c911c3d20102a95c3d4ff1ed941b565a5f9cf7 AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c -DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a -EBUILD libsc-2.2-r100.ebuild 2291 BLAKE2B 418dc0bc9219b6f897523352c8c056c2e495fe5e89634f29aea1810fba4ad23073c544b807c42bd594eb3f2892e320918b9cb0151f5aece319d442c2a9517706 SHA512 7922b32ff3989cedb0b34fa9b6abedd8cdd8a890ede27dade44fb3e2082b353c47444f30a21f4e0d5e84c3cc78a16dd92dcfcf1dcdf8a267f9327915be723cf1 -EBUILD libsc-2.3.1.ebuild 2333 BLAKE2B ec5969ed4acac58bfd0d50675ac8b7b52f552f6cc82c9270edf72f2a18464333fc5bdcde0670ede24f6bd0b6e80ff13023dae91f97c6d10c8434fd3a27162934 SHA512 a257c87659a08a3a68ae2f9096c5f0633fc892ef15e59c76f966fe8994200571c7a1ca0185bf8145e7a9cfffd92c0798c2a8123325bc17fbf00cff4e1359b847 -EBUILD libsc-9999.ebuild 2301 BLAKE2B d0512fc7b8fbcf57439361287a160376a9b88fed9c8bb8d6026d95a133f50fd6f0796e81e143f55abbf5d964a9a55dbaf57a83b3a28f2dca02cae1cac553ce22 SHA512 0ffaeb80966af4463a496059605895669bde82381b3a8bfd76d899806d8cba863ac6a252ec400a38659b872126fb4dd5d69e4816334c87e430665183382ea064 +EBUILD libsc-2.3.1-r1.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a +EBUILD libsc-9999.ebuild 2297 BLAKE2B 0afe3197122a28663aabd949c40add49441e978cfd02b3bcf6072c1b844c02922bdfeb87626e28f46d9047dbd299d9edcd0299e7b7cb28e2739e03619f9d754d SHA512 acbab2613f93d41789f38057d0385be80d8729ac34cdd6011eda569f5a5595d6eedd68a91858c622acb096392cfa6743453657be287de600e10fda8550b64868 MISC metadata.xml 712 BLAKE2B 9e1ddf9aece6b04220d62626d4fd3af7b2f02a99f52b526482166bbd27b131dfaa3b6acf6e9324667a5f942617dcc78463631fea0e08e7dc84aa401bbd51741c SHA512 fa2abd50b887f928a97f3612a53f3254e08be476d5e4ca699bc25143bb13f4f83d69f9040c937710cb70399e2e7a4de8ca86d412173d9bd32257313bb4d12d74 diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch deleted file mode 100644 index c2cbdb1b003b..000000000000 --- a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/config/sc_include.m4 -+++ b/config/sc_include.m4 -@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES], - [ - SC_REQUIRE_LIB([m], [fabs]) - SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1]) --SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable], -+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], - [LUA], [$1]) - SC_CHECK_BLAS_LAPACK([$1]) - SC_BUILTIN_ALL_PREFIX([$1]) ---- a/configure.ac -+++ b/configure.ac -@@ -74,7 +74,7 @@ echo "| Checking headers" - echo "o---------------------------------------" - - AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h]) --AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h]) -+AC_CHECK_HEADERS([$LUA_IMPL/lua.h]) - - echo "o---------------------------------------" - echo "| Checking functions" ---- a/src/sc_lua.h -+++ b/src/sc_lua.h -@@ -30,23 +30,9 @@ - - SC_EXTERN_C_BEGIN; - --#ifdef SC_HAVE_LUA5_2_LUA_H --#include <lua5.2/lua.h> --#include <lua5.2/lualib.h> --#include <lua5.2/lauxlib.h> --#else --#ifdef SC_HAVE_LUA5_1_LUA_H --#include <lua5.1/lua.h> --#include <lua5.1/lualib.h> --#include <lua5.1/lauxlib.h> --#else --#ifdef SC_HAVE_LUA_H --#include <lua.h> --#include <lualib.h> --#include <lauxlib.h> --#endif --#endif --#endif -+#include <@LUA_IMPL@/lua.h> -+#include <@LUA_IMPL@/lualib.h> -+#include <@LUA_IMPL@/lauxlib.h> - - SC_EXTERN_C_END; - diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild deleted file mode 100644 index e29a4201d39b..000000000000 --- a/sci-libs/libsc/libsc-2.2-r100.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} ) - -inherit autotools lua-single toolchain-funcs - -DESCRIPTION="Support for parallel scientific applications" -HOMEPAGE="http://www.p4est.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch -) - -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi -} - -src_prepare() { - default - - sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die - - # Inject a version number into the build system - echo "${PV}" > ${S}/.tarball-version || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp openmp) - $(use_enable romio mpiio) - $(use_enable static-libs static) - $(use_enable threads pthread) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Remove ac files, bug #619806 - rm -r "${ED}"/usr/share/aclocal || die "rm failed" - - # Fix wrong installation paths: - dodir /usr/share/libsc - mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/usr/share/ini || die "rmdir failed" -} diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild index e84c20273cf0..667c713b0096 100644 --- a/sci-libs/libsc/libsc-2.3.1.ebuild +++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild @@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" EGIT_BRANCH="develop" - SRC_URI="" else SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -22,35 +21,32 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} romio? ( mpi )" -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch "${FILESDIR}"/${PN}-2.3-add_soname.patch ) -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup } src_prepare() { @@ -65,11 +61,11 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" @@ -98,4 +94,7 @@ src_install() { rmdir "${ED}"/etc/ || die "rmdir failed" mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild index b99e72325210..00143eccd873 100644 --- a/sci-libs/libsc/libsc-9999.ebuild +++ b/sci-libs/libsc/libsc-9999.ebuild @@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" EGIT_BRANCH="develop" - SRC_URI="" else SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -22,34 +21,31 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} romio? ( mpi )" -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch ) -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup } src_prepare() { @@ -64,11 +60,11 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" @@ -97,4 +93,7 @@ src_install() { rmdir "${ED}"/etc/ || die "rmdir failed" mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest index a8c0b2ab730d..006efabe1859 100644 --- a/sci-libs/orocos_kdl/Manifest +++ b/sci-libs/orocos_kdl/Manifest @@ -1,6 +1,4 @@ -AUX orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch 763 BLAKE2B 2d8c88ae2261b9f8689dc9900bb93d554656135c5507246db8b6280bce20a18e932b9ec69737adf7a00e32d384784681cbe95cc5b747b85d189be5356ab606b1 SHA512 e7cba8158efcf3b7638f344d717666070a545baf8b96e52bb9a10ed11575e062806569a3c5299c4439491709ebcc2eef1113623479b641df8ea1a45190a8938f -AUX orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch 686 BLAKE2B ad47abd10972b668a8656be08c24fc1cca356e33177b2949aa3e9cc07022bd0d8bdfaf16daa4957cb81f84a3806f0617ee464e0c6067045520ad18e8cf85aa40 SHA512 1223b4f503d8f394a0c73c91c231e96e83b241f31afcc7dfb3ae7f7b6a96e367fa294bfa9759be4e8de419f00f18a489713fe25bf1a037dedd116da314856f1b -DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8 -EBUILD orocos_kdl-1.4.0-r2.ebuild 1782 BLAKE2B a0788001c6eab7a3c5208776b47a6aa07ee00e71f530bd1d07134a696e94e5c101f00672faf8a9b50291ac033402f07e35cfb8f3c9cc9c349b48df2c9b7af7b2 SHA512 4130d847b169ca69a0a7ab3da52b5c2cc034eb155b78881e426557760800b20e60bdf5be353f72c0fb4ae229d7577389bdf2f2083645875bbdba94d0adbb2c9e -EBUILD orocos_kdl-9999.ebuild 1707 BLAKE2B 0f42c6fe09c59e3e91c20aa24fc3f20bc4288e5ca321ff0b801d0ff269118d73b3848a65d7a1cce2d1ee348fc5ea0c07664a456423a8546acdabcf103cd1816f SHA512 bb290e4d6a1667aa98f9a80deea798ef3d7ca54ab8fb1315f57afbdbb9dd9f54f6d53a490f0562e02f880320092c19e7912cd69fa4b58e7b1a346ecf421405f4 +DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49 +EBUILD orocos_kdl-1.5.0.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3 +EBUILD orocos_kdl-9999.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch deleted file mode 100644 index d3205b556284..000000000000 --- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 719735a7d36f079f63c4be06bf3118581f628562 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 3 Apr 2021 18:39:42 +0200 -Subject: [PATCH] don't install kdl.tag file - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - doc/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index dcc81b0..cc1774e 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1,4 +1,3 @@ - - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" IMMEDIATE @ONLY) - ADD_CUSTOM_TARGET(docs "doxygen" "Doxyfile") --INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdl.tag DESTINATION share/doc/liborocos-kdl/ OPTIONAL) # only installs if found. --- -2.31.1 - diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch deleted file mode 100644 index fe7eb126f84b..000000000000 --- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 54e66339b734639dc42b63b65a8a4b100f2549c3 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 3 Apr 2021 18:46:42 +0200 -Subject: [PATCH] add LIB_SUFFIX in pkg-config file - -Add the LIB_SUFFIX suffix to the libdir variable -in the kdl.pc.in file. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - src/kdl.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kdl.pc.in b/src/kdl.pc.in -index 49e2ab9..1650e2e 100644 ---- a/src/kdl.pc.in -+++ b/src/kdl.pc.in -@@ -1,5 +1,5 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX@ - includedir=${prefix}/include - - Name: orocos-kdl --- -2.31.1 - diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild index 175baf488d17..bb20a06d821c 100644 --- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild +++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="LGPL-2.1" -SLOT="0/14" +SLOT="0/15" IUSE="doc examples models test" REQUIRED_USE="examples? ( models )" RESTRICT="!test? ( test )" @@ -31,12 +31,9 @@ BDEPEND=" test? ( dev-util/cppunit ) " -PATCHES=( - "${FILESDIR}"/${P}-0001-don-t-install-kdl.tag-file.patch - "${FILESDIR}"/${P}-0002-add-LIB_SUFFIX-in-pkg-config-file.patch -) - src_configure() { + # disable catkin support + sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die local mycmakeargs=( -DBUILD_MODELS=$(usex models ON OFF) -DENABLE_EXAMPLES=$(usex examples) @@ -73,8 +70,4 @@ src_install() { docinto examples dodoc -r "${S}"/examples/. fi - - # Need to have package.xml in our custom gentoo path - insinto /usr/share/ros_packages/${PN} - doins "${ED}/usr/share/${PN}/package.xml" } diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild index d50c631a39c3..bb20a06d821c 100644 --- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild +++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="LGPL-2.1" -SLOT="0/14" +SLOT="0/15" IUSE="doc examples models test" REQUIRED_USE="examples? ( models )" RESTRICT="!test? ( test )" @@ -31,11 +31,9 @@ BDEPEND=" test? ( dev-util/cppunit ) " -PATCHES=( - "${FILESDIR}"/${PN}-1.4.0-0001-don-t-install-kdl.tag-file.patch -) - src_configure() { + # disable catkin support + sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die local mycmakeargs=( -DBUILD_MODELS=$(usex models ON OFF) -DENABLE_EXAMPLES=$(usex examples) @@ -72,8 +70,4 @@ src_install() { docinto examples dodoc -r "${S}"/examples/. fi - - # Need to have package.xml in our custom gentoo path - insinto /usr/share/ros_packages/${PN} - doins "${S}/package.xml" } diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index 9bf258f97022..ecc16a921e1d 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,10 +1,7 @@ AUX p4est-2.3-add_soname.patch 559 BLAKE2B 3a4037ef9f9343aa9ecadb4f5406821152f0d7c9d2fa461a5fa9c74a8a0088101fe6d374c38c52e489e6a1aee818733ed08f57d13f0d50497bc9edfd8f14a538 SHA512 2b16c58c2b897abe31f26cd128eb99716961369e3c41a411ac79b8a31f51864bd346a46d8c78e6ed2206073555237b647346afd475c40d5012c60dae890c839a AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7 -DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a -DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299 DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23 -EBUILD p4est-2.2-r100.ebuild 2908 BLAKE2B 768a3e492a9b2dc00dba2443111e6a39cc701b113a696398f93a2b9947ca6ca8fc7fe1203c8e650e3dc122161ca55b85f91f2bded64b13bd0a60d3618d8529f8 SHA512 9ec1e876334f5cd13e148b68a30a661ce03e91cdd0f4dcd6126b044c0fd645ee4494e1e6aa03edb8f787ad10a1136f47cc636f8a44e38aafdc482a85d17a3461 -EBUILD p4est-2.3.1.ebuild 2913 BLAKE2B eed1fe198cdab40113eb84ca27cf01abf416fe3bb2e9038366855bfb8e6df0bd6a934b92bc9a654d2369917183206e5014163aedda21996fe0e459f232e7be1b SHA512 44eb74926a3bd881beecc63d74de81f62cbd3ee698ce7b482b2e0c4eaf8dea5542eb23517a534234d175bf8f8bfe30dbad9e73dff4fdde889177b526fdcac442 -EBUILD p4est-9999.ebuild 2908 BLAKE2B 25d8be9880948ec1d3f30c3e10049b89f1d05880e366b74f60e814847baa7b63f5582013f28ba41af3ab3055912c823b580f2021f55d6e91fcd79da3d811f1d5 SHA512 27dd306e9a793bdcb08c4eaab32d39facfaae784e80f2c50e0f137c9a9121d5e5304a0b432003c55c695df8bacd0e5a83265bfd8629833baad4b5af2d60c831d +EBUILD p4est-2.3.1-r1.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9 +EBUILD p4est-9999.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9 MISC metadata.xml 932 BLAKE2B 7125dfc51747febbc0c075085cfd92b86fdf92814a8ce104c980891ffae0eb0c1056a3d8d029fca27faaaa3df8a13e43909f4dcd3fb7bae77aa280f418e344af SHA512 65de097b1150b51b50bc5a163386cd902ad885963448a0d1f345378da56153f2881209d1f7b04a39be2c294ca80d8d59f05e2e6f3d9765c071cad15c18e843ba diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild deleted file mode 100644 index ee878cbfc3ee..000000000000 --- a/sci-libs/p4est/p4est-2.2-r100.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} ) - -# The build system currently fails with everything newer than 1.11. -WANT_AUTOMAKE=1.11 - -inherit autotools lua-single toolchain-funcs - -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" -HOMEPAGE="http://www.p4est.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI=" - https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -# TODO petsc -IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio=] )" - -DEPEND=" - ${RDEPEND} - sys-devel/automake:1.11 - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README ) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi -} - -src_prepare() { - default - - # Inject libsc to get all parts of the build system... - if ! [[ ${PV} = *9999* ]]; then - rmdir "${S}/sc" || die "rmdir failed" - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed" - fi - - # Inject a version number into the build system - echo "${PV}" > ${S}/.tarball-version - - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config" - eautoreconf - - sed -i \ - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \ - "${S}"/configure || die "sed failed" - - sed -i \ - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \ - "${S}"/configure || die "sed failed" -} - -src_configure() { - # avoid underlinkage - LDFLAGS="${LDFLAGS} -lsc" - - local myeconfargs=( - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp) - $(use_enable romio mpiio) - $(use_enable static-libs static) - $(use_enable threads pthread) - $(use_enable vtk-binary) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${EPREFIX}/usr" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - use doc && dodoc -r doc/* - - if use examples - then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Fix wrong installation paths: - dodir /usr/share/p4est - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" -} diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild index 597b67a136a5..c7756fee11c5 100644 --- a/sci-libs/p4est/p4est-2.3.1.ebuild +++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} ) -inherit autotools lua-single toolchain-funcs +inherit autotools flag-o-matic lua-single toolchain-funcs DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/" @@ -26,34 +26,31 @@ LICENSE="GPL-2+" SLOT="0" # TODO petsc -IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" +IUSE="debug doc examples mpi openmp romio threads +vtk-binary" REQUIRED_USE="${LUA_REQUIRED_USE} romio? ( mpi )" RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] + ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )" - -DEPEND=" - ${RDEPEND} - sys-devel/automake - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch "${FILESDIR}"/${PN}-2.3-add_soname.patch ) -DOCS=( AUTHORS NEWS README ) - pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup } src_prepare() { @@ -82,19 +79,19 @@ src_prepare() { src_configure() { # avoid underlinkage - LDFLAGS="${LDFLAGS} -lsc" + append-libs -lsc local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) $(use_enable vtk-binary) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${EPREFIX}/usr" + --with-sc="${ESYSROOT}/usr" ) econf "${myeconfargs[@]}" } @@ -119,4 +116,7 @@ src_install() { mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" rmdir "${ED}"/etc/ || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild index bb4b3a864ed0..c7756fee11c5 100644 --- a/sci-libs/p4est/p4est-9999.ebuild +++ b/sci-libs/p4est/p4est-9999.ebuild @@ -5,10 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} ) -# The build system currently fails with everything newer than 1.11. -WANT_AUTOMAKE=1.11 - -inherit autotools lua-single toolchain-funcs +inherit autotools flag-o-matic lua-single toolchain-funcs DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/" @@ -29,29 +26,31 @@ LICENSE="GPL-2+" SLOT="0" # TODO petsc -IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" +IUSE="debug doc examples mpi openmp romio threads +vtk-binary" REQUIRED_USE="${LUA_REQUIRED_USE} romio? ( mpi )" RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] + ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -DEPEND=" - ${RDEPEND} - sys-devel/automake:1.11 - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch + "${FILESDIR}"/${PN}-2.3-add_soname.patch +) pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup } src_prepare() { @@ -80,19 +79,19 @@ src_prepare() { src_configure() { # avoid underlinkage - LDFLAGS="${LDFLAGS} -lsc" + append-libs -lsc local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) $(use_enable vtk-binary) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${EPREFIX}/usr" + --with-sc="${ESYSROOT}/usr" ) econf "${myeconfargs[@]}" } @@ -117,4 +116,7 @@ src_install() { mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" rmdir "${ED}"/etc/ || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 824de612114e..dec6627b2046 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,4 +1,4 @@ -DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2 -EBUILD pcl-1.11.1-r1.ebuild 2166 BLAKE2B 274829fa374065b8f32f834c29706dd884d312483f152f6ffaf2d0bab0d4f6533903a80a3774007f8ed703255dc5f78a47ffd478724ed98e2d78f1fa9cc24852 SHA512 ca09b24479465af55a95ab640905a94233615ad5da8a596b71bc69a71c241b542418c90aed33461ce539104f446c5a44f29f262f7e870ceb6a4dcfe17184ebef -EBUILD pcl-9999.ebuild 2166 BLAKE2B 274829fa374065b8f32f834c29706dd884d312483f152f6ffaf2d0bab0d4f6533903a80a3774007f8ed703255dc5f78a47ffd478724ed98e2d78f1fa9cc24852 SHA512 ca09b24479465af55a95ab640905a94233615ad5da8a596b71bc69a71c241b542418c90aed33461ce539104f446c5a44f29f262f7e870ceb6a4dcfe17184ebef +DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f +EBUILD pcl-1.12.0.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f +EBUILD pcl-9999.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf diff --git a/sci-libs/pcl/pcl-1.11.1-r1.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild index 4f9bd374f66e..1ab0b8e362ff 100644 --- a/sci-libs/pcl/pcl-1.11.1-r1.ebuild +++ b/sci-libs/pcl/pcl-1.12.0.ebuild @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" fi -inherit ${SCM} cmake-utils multilib +inherit ${SCM} cmake multilib if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" @@ -22,7 +22,7 @@ fi HOMEPAGE="https://pointclouds.org/" DESCRIPTION="2D/3D image and point cloud processing" LICENSE="BSD" -SLOT="0/1.11" +SLOT="0/1.12" IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" RESTRICT="!test? ( test )" @@ -79,5 +79,5 @@ src_configure() { "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" "-DBUILD_TESTS=$(usex test TRUE FALSE)" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild index 4f9bd374f66e..1ab0b8e362ff 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-9999.ebuild @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" fi -inherit ${SCM} cmake-utils multilib +inherit ${SCM} cmake multilib if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" @@ -22,7 +22,7 @@ fi HOMEPAGE="https://pointclouds.org/" DESCRIPTION="2D/3D image and point cloud processing" LICENSE="BSD" -SLOT="0/1.11" +SLOT="0/1.12" IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" RESTRICT="!test? ( test )" @@ -79,5 +79,5 @@ src_configure() { "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" "-DBUILD_TESTS=$(usex test TRUE FALSE)" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest index 334dd41a9227..a10ef5197122 100644 --- a/sci-libs/qd/Manifest +++ b/sci-libs/qd/Manifest @@ -1,4 +1,17 @@ +AUX 0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch 929 BLAKE2B 35e344c408d6ebe01760a421024e3cf8e0b0fd051ff5ab7992a8fe672e2066277001a1725dc9e6a1183620688bb38791c79313a371409ff6a59de176da7770b8 SHA512 fdb8561244582a63bfa356c8aae0f3bdc91d2e9e36bb11be7c8ac7be3b7f60f1ecb4c87b8d89810fc8576eed6ae5356a9d80c13fef0aa37062fe7b127d8530fa +AUX 0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch 1000 BLAKE2B fa8a818b6eace5ae2d1d8d1da309e65b30b272cad3b2fbcaaedcb61070eff1f1b0db3b1594ddf6471b89361983f2685d49fbddbf0f33e7826bc2ce0db226ce89 SHA512 43a50f9df2b672838bef8e437b23987ca92bc7e7624f04bf2aa919bc5938e08fc1c6243e17d3c1c9e384176ef0d2d3aa0ba34e615d2316d7369520d9246a0d1d +AUX 0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch 1135 BLAKE2B 8e86456585f07da2060f63411e4f665285665f86f78f11a1cf2a15e0d62c1d5efa33e619bec0cab9d61f854f82dd199960e214ec3378694db6e08067cb1d7929 SHA512 2a978e3f39e7b5bb8c5cb92d88b2c4b39d82ee8061cdbdd6b76aa8cfbd6d4918fd02cef440ec931c4599f7b2833ee942ebe8b51692d92450cbfdac65a14b24b5 +AUX 0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch 4692 BLAKE2B 9275336264e44d92bd7f02eba07b8f212626d37a07474dcc38bcfb24cf35750784420292e12120102673af8b42042621437dccdbd448ecf341d7883dbba56788 SHA512 32ef4f3c6f7ced7ac074594956c9d79bc4e8ed15ddeefeb3b14eca6ad1b53578dfba52cca16b3dc515290eb80c101a1452ef69379f245160d2f693397510a0d4 +AUX 0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch 1300 BLAKE2B 51623f11f92cf43252992ffa9d52d052b1370b674132232a02e33d9af5025aa195894e37eb0403e873b2112f2491b55dcf5a498da82333b474f8ed1d0c4e544a SHA512 371d9b6f41a019e985fb9876bdddf702771d1fac86a5bc14ef346344fad183788f4ba739bea59b47b673a5ac7df0c4f8fa0dbe8e24a5295bf1d9b92a52768659 +AUX 0006-configure.ac-remove-enable-debug-flag.patch 3510 BLAKE2B d908f6a1dd47b70d2731b9b645a9c6fb713c43cdcdd22bceeba57532f891a6beb9d0aa3efe4c7e5e1daf287f5f09ecd392fe48aa92c3bc3da18d884362746186 SHA512 b2629f6d90232dd0bd26eb55d14c844e218791d832038b13aa5f4b3836ae6b54aa27c32d9dc0002b3275d6cf01928da69b26fa56390fc3261f001afa05c74cdc +AUX 0007-config.h.in-remove-QD_DEBUG-constant.patch 840 BLAKE2B 720f9992ec61c806f39837f31f68c35173708c50c14886bc39a286f5be513f49c7b663f60587af25bdc4f851409915da31300777e477d2b22b56f51d856262b4 SHA512 fda6efc3cbc5c868007653662fd0400351f0016725b62895fe5528495e6cb77ceb027755ff08c1475786511bf7a50e6e671612fd7643e3e247c4485182af0f0e +AUX 0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch 1697 BLAKE2B f28e848cc3a6c6c513dc98c9e7d50027446d02c6ffe070a15de3cc56c77fb253a132836ac2d0eaed37cad09cc4cabbd8779806fcd89eaa70eecca09601973851 SHA512 f78205cbcd564f79fb1a1cc1002fc5bc1429428a4da7243c3894a5c33f7082376537f9f5edf33dce0192386354ee4a54885117c15a64856dd03a9ff116ef5293 +AUX 0009-configure.ac-don-t-set-CC-to-CXX.patch 1338 BLAKE2B 5c58663a9f51c9a05b78d3bfaa2584a3af53488e1afdf7f49edb2d5374b977bbb2cb62555f23ac6ea5c8bdff5682b3581051b2e6aefc4bc48dbcca0d99a8479b SHA512 27f3111aa7160eb1028f4bb40ebb002e5b7c2bb8e51b2dc6740fc37b25673274017d3e2cfffdc1de49e65cc148ede949e2eee914765ba8580db2efb2798e9cad +AUX 0010-configure.ac-don-t-manually-search-for-compiler-name.patch 2523 BLAKE2B df5b8c919751ae74b70158cdeb715c83d3e57efa9497a81748cfcc10e77f557eee49f69383713dfc2cdd35239b6df8125c1dccd54d73953da0fc7a72d10acb52 SHA512 481d84a28cfbbd1f5768d0324d9a3c74326871c46d2e414d52a8c742e70aedbf6461f6b7dca567c3a2683baf1782248d9d942d766af3187094db7782049ccda7 +AUX 0011-qd-config.in-remove-REQ_CXXFLAGS.patch 751 BLAKE2B 95c283128d2218cde0a9f3baf1ce43d1aadf6a4cb47be830e2ee043a61988b32c9d8b1bdf025bd67f84c2ebe37aa2d04d3d60de7fde2177cdbd6ec78fa4b2718 SHA512 c36319dab08581730c8943b77cadfa93fb36f982aa6bf774909473c7dc27fd687c45d3e876e84b5c3d5fb3b49b1f93b58ea860d273dce56df0705028d7a04bd4 +AUX 0012-configure.ac-remove-the-enable-warnings-flag.patch 1544 BLAKE2B 54c316843f90676110ff41e37ac8968de871975b0d12debb9358edc446f742c1bd8914e1c681a3ab7f4050c28f4c63cce9521b3a79de6960b1f92a6132be3616 SHA512 42180e95744a0d0b6b577afe4deba95d171ea7d14d6ff3f189ad01f78667fcf4b2f81842f47b66e6ccb020beb0da0740b7cf67989835bd8871ec3cbb4817ddfb AUX qd-2.3.22-fix-build-system.patch 6617 BLAKE2B 6712f53a1b46a4d1f74d45380330ff5b15b7f2216f61245d467748557f607f670fbb0d977f4e6455c93c383ef6eb466e243177d29a3227ba89cf34ec836c54d2 SHA512 e70d4b87342840fb63cab04e63ceddb790d5509f65188894cbedb077042e2dbb6e7e18a108589fb77e8ec6253ba6b70680f637ce30c62575aa4a0eb7fbed36ce DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b +EBUILD qd-2.3.22-r1.ebuild 1835 BLAKE2B b0d5760fd7d5254cff90ccc55bc32e7f6835e4528a1d0bf68a4f85c391f4afc2c297be7090c4f7275bb9366742b9914b1d87721e7b44377188cc751b11fa2a00 SHA512 56b3c7c80523528a5c474b260abe5405a6309f3704332321fb3e0dd877f4b55540dabfa81202deb0dcaf27f4ca6924d7e06d02f92c94f5042275a2f5e626f95a EBUILD qd-2.3.22.ebuild 1100 BLAKE2B 50c55e5d7b4bb1d1e8c0298619aad3ec1d7ba65084dd87f59105cd2be3a4e940ab71e03ecdbb3e3fd842d9604fc84df1c4c5b8ed30a9d5c8a1508be364aa7f5f SHA512 f86a94765cd174ec9d2573d79cb39e94c381d4d752ca13ea47d805336381284dd6382695c375e589899f627cf9bf2fb5b66688f82f598dcd3c5b9dd1461bac95 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706 diff --git a/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch b/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch new file mode 100644 index 000000000000..4fe4d49fa92b --- /dev/null +++ b/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch @@ -0,0 +1,31 @@ +From a05e1577085507266908f40ff8e5246e10eb72d1 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 18:29:45 -0400 +Subject: [PATCH 01/12] configure.ac: update QD_PATCH_VERSION to 2.3.22. + +Autotools currently thinks that this is version 2.3.12, as can be seen +when running + + $ ./configure + configuring qd 2.3.12... + +We update QD_PATCH_VERSION within configure.ac to fix that. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2ca10c9..7485936 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. +-define([QD_PATCH_VERSION], 12) ++define([QD_PATCH_VERSION], 22) + AC_PREREQ(2.60) + AC_INIT(qd, 2.3.QD_PATCH_VERSION, dhbailey@lbl.gov) + AC_CONFIG_SRCDIR([src/qd_real.cpp]) +-- +2.31.1 + diff --git a/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch b/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch new file mode 100644 index 000000000000..956feb275117 --- /dev/null +++ b/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch @@ -0,0 +1,34 @@ +From 0641c0b9dd87bfbef6a7b6e77cf4b264e3fa84d7 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 18:32:21 -0400 +Subject: [PATCH 02/12] configure.ac: replace AM_CONFIG_HEADER with + AC_CONFIG_HEADERS. + +The AM_CONFIG_HEADER macro is obsolete, as evidenced by warnings like, + + configure.ac:21: warning: 'AM_CONFIG_HEADER': this macro is obsolete. + configure.ac:21: You should use the 'AC_CONFIG_HEADERS' macro instead. + +This commit uses the suggested replacement. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7485936..7b52a9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,8 +18,8 @@ echo "configuring $PACKAGE $VERSION..." + + AC_CONFIG_AUX_DIR(config) + AM_INIT_AUTOMAKE([nostdinc foreign]) +-AM_CONFIG_HEADER([config.h]) +-AM_CONFIG_HEADER([include/qd/qd_config.h]) ++AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_HEADERS([include/qd/qd_config.h]) + + AC_CANONICAL_HOST + +-- +2.31.1 + diff --git a/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch b/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch new file mode 100644 index 000000000000..e436c04716db --- /dev/null +++ b/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch @@ -0,0 +1,37 @@ +From a6ba0059c80849ef349b9d02e5972f89fcd59793 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 18:40:26 -0400 +Subject: [PATCH 03/12] configure.ac: replace AC_PROG_LIBTOOL with LT_INIT. + +The AC_PROG_LIBTOOL macro is obsolete, according to modern versions of +autoconf: + + configure.ac:316: warning: The macro `AC_PROG_LIBTOOL' is obsolete. + configure.ac:316: You should run autoupdate. + +Running autoupdate replaces it with a call to LT_INIT, which is what +this commit does too. We have also removed a call AC_DISABLE_SHARED, +which no longer affects anything; its removal is "harmless" since, at +worst, it will cause some people to build shared libraries that they +do not need. +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7b52a9e..31b32f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -312,8 +312,7 @@ AC_SUBST(FFLAGS, $FCFLAGS) + AC_CHECK_LIB(m,sqrt) + + # libtool stuff +-AC_DISABLE_SHARED +-AC_PROG_LIBTOOL ++LT_INIT + + # Output + AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile +-- +2.31.1 + diff --git a/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch b/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch new file mode 100644 index 000000000000..aad1936b7017 --- /dev/null +++ b/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch @@ -0,0 +1,100 @@ +From 829c868c9655fa7dfd4a64a42476fe1eddadc792 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 18:47:12 -0400 +Subject: [PATCH 04/12] configure.ac: fix syntax of all AC_ARG_ENABLE calls. + +Currently, we find AC_ARG_ENABLE being called like + + AC_ARG_ENABLE(enable_inline, ... + +where the corresponding argument should be --enable-inline. The +autoconf documentation however suggests that this should be + + AC_ARG_ENABLE([inline], ... + +so we update all of these calls accordingly. In the process, we update +all of the corresponding AC_HELP_STRING instances, since that macro +has been superseded by AS_HELP_STRING. +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 31b32f5..1e91cd1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,7 +25,7 @@ AC_CANONICAL_HOST + + # Checks for arguments + # --enable-inline +-AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions. [[default=yes]]])) ++AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions. [[default=yes]]])) + AC_MSG_CHECKING([if commonly used function is to be inlined]) + if test "$enable_inline" != "no"; then + enable_inline="yes" +@@ -34,7 +34,7 @@ fi + AC_MSG_RESULT($enable_inline) + + # --enable-ieee-add +-AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound. [[default=no]]])) ++AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound. [[default=no]]])) + AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used]) + if test "$enable_ieee_add" = "yes"; then + AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.]) +@@ -44,7 +44,7 @@ fi + AC_MSG_RESULT($enable_ieee_add) + + # --enable-sloppy-mul +-AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication. [[default=yes]]])) ++AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication. [[default=yes]]])) + AC_MSG_CHECKING([if sloppy multiplication is to be used]) + if test "$enable_sloppy_mul" != "no"; then + enable_sloppy_mul="yes" +@@ -53,7 +53,7 @@ fi + AC_MSG_RESULT($enable_sloppy_mul) + + # --enable-sloppy-div +-AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division. [[default=yes]]])) ++AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division. [[default=yes]]])) + AC_MSG_CHECKING([if sloppy division is to be used]) + if test "$enable_sloppy_div" != "no"; then + enable_sloppy_div="yes" +@@ -63,7 +63,7 @@ AC_MSG_RESULT($enable_sloppy_div) + + + # --enable-debug +-AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]])) ++AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]])) + AC_MSG_CHECKING([if debugging code is to be enabled]) + if test "$enable_debug" = "yes"; then + AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.]) +@@ -73,7 +73,7 @@ fi + AC_MSG_RESULT($enable_debug) + + # --enable-warnings +-AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]])) ++AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]])) + AC_MSG_CHECKING([if compiler warnings is to be enabled]) + if test "$enable_warnings" != "yes"; then + enable_warnings="no" +@@ -149,7 +149,7 @@ if test "$enable_debug" = "yes"; then + fi + + # --enable-fma +-AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]])) ++AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]])) + if test "x$enable_fma" = "x"; then + enable_fma="auto" + fi +@@ -248,7 +248,7 @@ if test "$FCFLAGS" = ""; then + FCFLAGS="-O2" + fi + fi +-AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]])) ++AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]])) + if test "$enable_fortran" != "no"; then + AC_LANG_PUSH(Fortran) + AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90]) +-- +2.31.1 + diff --git a/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch b/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch new file mode 100644 index 000000000000..cbd58a3af5f9 --- /dev/null +++ b/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch @@ -0,0 +1,35 @@ +From 12e53493a0413590d9dc0a0eaeeb4dfec71a1a8c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 18:52:30 -0400 +Subject: [PATCH 05/12] fortran/Makefile.am: fix underlinking of libqdmod and + libqd_f_main. + +The libqdmod library needs to be linked to the just-built libqd, and +then libqd_f_main needs to be linked to both the just-built libqd and +the just-built libqdmod. Moreover, both of them need to be linked +against whatever is in $FCLIBS. + +This commit adds two "_LIBADD" lines to fortran/Makefile.am to ensure +that this happens. Their absence most likely only causes problems when +the user has "--as-needed" in his LDFLAGS. +--- + fortran/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fortran/Makefile.am b/fortran/Makefile.am +index 1ab54f7..7a67c08 100644 +--- a/fortran/Makefile.am ++++ b/fortran/Makefile.am +@@ -16,7 +16,9 @@ endif + + lib_LTLIBRARIES = libqdmod.la libqd_f_main.la + libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp ++libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS) + libqd_f_main_la_SOURCES = main.cpp ++libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS) + ddmod.lo: $(DDEXT) ddext.lo + qdmod.lo: ddmod.lo $(DDMOD) qdext.lo + $(QDMOD): qdmod.lo $(DDMOD) +-- +2.31.1 + diff --git a/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch b/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch new file mode 100644 index 000000000000..151ec930e5aa --- /dev/null +++ b/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch @@ -0,0 +1,102 @@ +From 6aac051631b20f5cde990fb3eda8dae85ff29666 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:01:17 -0400 +Subject: [PATCH 06/12] configure.ac: remove --enable-debug flag. + +The --enable-debug flag only does two things at the moment: + + 1. It adds "-O" (as opposed to "-O2") to your CXXFLAGS and FCFLAGS. + 2. It adds "-g" to your CXXFLAGS and FCFLAGS. + +When using gcc and gfortran, this is a convenient way to enable those +debugging flags. However, those options are not guaranteed to be +supported by other compilers. In the interest of simplicity and +portability, this commit simply removes the flag. + +It would of course be possible to compile two test programs with +CXXFLAGS="-g -O" and FCFLAGS="-g -O" to determine whether or not those +flags are supported. That would solve half of the problem, but would +be a no-op (that is, it would not enable any debugging features) on +systems where the flags are not supported. That problem is more +difficult to solve, and hints that it's best to leave specific +compiler flags out of the build system whenever possible. +--- + configure.ac | 30 ++---------------------------- + 1 file changed, 2 insertions(+), 28 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1e91cd1..108e58a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,16 +62,6 @@ fi + AC_MSG_RESULT($enable_sloppy_div) + + +-# --enable-debug +-AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]])) +-AC_MSG_CHECKING([if debugging code is to be enabled]) +-if test "$enable_debug" = "yes"; then +- AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.]) +-else +- enable_debug="no" +-fi +-AC_MSG_RESULT($enable_debug) +- + # --enable-warnings + AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]])) + AC_MSG_CHECKING([if compiler warnings is to be enabled]) +@@ -84,11 +74,7 @@ AC_MSG_RESULT($enable_warnings) + # Checks for programs. + AC_LANG(C++) + if test "$CXXFLAGS" = ""; then +- if test "$enable_debug" = "yes"; then +- CXXFLAGS="-O" +- else +- CXXFLAGS="-O2" +- fi ++ CXXFLAGS="-O2" + fi + + # Set up compiler search list. DUe to possible case insensitive filesystems, +@@ -144,10 +130,6 @@ if test "$enable_warnings" = "yes"; then + fi + fi + +-if test "$enable_debug" = "yes"; then +- CXXFLAGS="$CXXFLAGS -g" +-fi +- + # --enable-fma + AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]])) + if test "x$enable_fma" = "x"; then +@@ -242,11 +224,7 @@ AC_DEFINE([QD_HAVE_STD], [1], [Define to 1 if your compiler have the C++ standar + + # Check for fortran-90 compiler + if test "$FCFLAGS" = ""; then +- if test "$enable_debug" = "yes"; then +- FCFLAGS="-O" +- else +- FCFLAGS="-O2" +- fi ++ FCFLAGS="-O2" + fi + AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]])) + if test "$enable_fortran" != "no"; then +@@ -296,14 +274,10 @@ if test "$enable_fortran" != "no"; then + fi + AC_SUBST(REQ_FCFLAGS) + FCFLAGS="$FCFLAGS $REQ_FCFLAGS" +- if test "$enable_debug" = "yes"; then +- FCFLAGS="$FCFLAGS -g" +- fi + AC_LANG_POP(Fortran) + fi + AM_CONDITIONAL(UPCASE_MODULE, [test "$module_case" = "uppercase"]) + AM_CONDITIONAL(HAVE_FORTRAN, [test "$enable_fortran" = "yes"]) +-AM_CONDITIONAL(QD_DEBUG, [test "$enable_debug" = "yes"]) + + AC_SUBST(F77, $FC) + AC_SUBST(FFLAGS, $FCFLAGS) +-- +2.31.1 + diff --git a/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch b/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch new file mode 100644 index 000000000000..f3538b4953e6 --- /dev/null +++ b/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch @@ -0,0 +1,29 @@ +From 0e7e6933467c76f97c4c1233558c3e1f8f17b52e Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:08:36 -0400 +Subject: [PATCH 07/12] config.h.in: remove QD_DEBUG constant. + +Having removed the --enable-debug flag from the configure script in an +earlier commit, the constant QD_DEBUG will never be defined (or used, +as it happens) in config.h. We remove it too. +--- + config.h.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/config.h.in b/config.h.in +index a08fd0e..dcb4272 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -112,9 +112,6 @@ + /* Define this macro to be the copysign(x, y) function. */ + #undef QD_COPYSIGN + +-/* Define to 1 to enable debugging code. */ +-#undef QD_DEBUG +- + /* If fused multiply-add is available, define correct macro for using it. */ + #undef QD_FMA + +-- +2.31.1 + diff --git a/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch b/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch new file mode 100644 index 000000000000..5f560a816aec --- /dev/null +++ b/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch @@ -0,0 +1,47 @@ +From fc272f5407e10e84dc1d3e0013bc6d43ecedc5db Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:10:34 -0400 +Subject: [PATCH 08/12] configure.ac: don't assume that "-O2" is a valid + compiler flag. + +Our configure script presently adds "-O2" to both CXXFLAGS and FCFLAGS +when those variables are empty. If using gcc and gfortran, this +enables some safe optimizations, but no checks are performed to ensure +that the compiler actually understands "-O2". While we could compile +some test programs to check, it may be simplest to leave the compiler +flags up to the person (the user) who chooses the compilers themselves. + +Support for --enable-debug was removed in a recent commit for similar +reasons. +--- + configure.ac | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 108e58a..823fa9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -73,9 +73,6 @@ AC_MSG_RESULT($enable_warnings) + + # Checks for programs. + AC_LANG(C++) +-if test "$CXXFLAGS" = ""; then +- CXXFLAGS="-O2" +-fi + + # Set up compiler search list. DUe to possible case insensitive filesystems, + # Cygwin and Apple systems sometimes gets confused between cc and CC. +@@ -223,9 +220,7 @@ AC_DEFINE([QD_API], [], [Any special symbols needed for exporting APIs.]) + AC_DEFINE([QD_HAVE_STD], [1], [Define to 1 if your compiler have the C++ standard include files.]) + + # Check for fortran-90 compiler +-if test "$FCFLAGS" = ""; then +- FCFLAGS="-O2" +-fi ++ + AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]])) + if test "$enable_fortran" != "no"; then + AC_LANG_PUSH(Fortran) +-- +2.31.1 + diff --git a/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch b/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch new file mode 100644 index 000000000000..14269ce2d75a --- /dev/null +++ b/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch @@ -0,0 +1,46 @@ +From eff1594d04f140d9e0a4c423a0685481a612c8ca Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:15:44 -0400 +Subject: [PATCH 09/12] configure.ac: don't set $CC to $CXX. + +The build system currently sets $CC to whatever $CXX that the +configure script is able to find. This was harmless until now because +C++ is a superset of C, so the C++ compiler should be able to compile +any C code. But in the recently-released autoconf-2.71, the test +program infrastructure no longer emits the + + #ifdef __cplusplus + extern "C" + #endif + +in the same place it used to, which is breaking the test for +name-mangling in the AC_FC_WRAPPERS macro. The macro thinks that it's +compiling C code, but using a compiler that expects C++. While this may +be fixable within autoconf, letting AC_PROG_CC detect the C compiler +separately is both morally correct in this case and happens to solve the +issue anyway. + +This fixes a build issue that was reported on Gentoo linux. + +Gentoo-bug: https://bugs.gentoo.org/775215 +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 823fa9e..a657e8f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -84,9 +84,6 @@ case $host in + esac + + AC_PROG_CXX($cxx_list) +-if test "$CC" = ""; then +- CC="$CXX"; +-fi + AC_PROG_CC + + +-- +2.31.1 + diff --git a/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch b/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch new file mode 100644 index 000000000000..e8bef28db329 --- /dev/null +++ b/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch @@ -0,0 +1,81 @@ +From 18d508793abbfc4045af7c7c91f6d71bb5bb7ef1 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:31:36 -0400 +Subject: [PATCH 10/12] configure.ac: don't manually search for compiler + names/flags. + +The AC_PROG_CXX macro is generally capable of finding the best C++ +compiler on the system these days, including the flags it needs. This +commit removes the hard-coded list of C++ compilers, and the manual +computation of REQ_CXXFLAGS based on the name of the compiler. + +This serves another purpose: the qd-config program is capable of +outputting an appropriate "-I" flag to allow consumers to use libqd +when it is installed in a nonstandard location. At the moment, however, +that "-I" flag is accompanied by whatever other REQ_CXXFLAGS were +computed -- and many of those flags are invalid in the other context. +By eliminating REQ_CXXFLAGS, we solve that problem too. +--- + configure.ac | 43 +------------------------------------------ + 1 file changed, 1 insertion(+), 42 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a657e8f..5ac7079 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -73,51 +73,10 @@ AC_MSG_RESULT($enable_warnings) + + # Checks for programs. + AC_LANG(C++) +- +-# Set up compiler search list. DUe to possible case insensitive filesystems, +-# Cygwin and Apple systems sometimes gets confused between cc and CC. +-# Try to use vendor compilers first, as they are often the fastest. +-case $host in +- *cygwin* | *mingw* ) cxx_list="" ;; +- *apple* ) cxx_list="xlC_r xlC icpc pathCC c++ g++ gpp" ;; +- * ) cxx_list="xlC_r xlC icpc pathCC pgCC cxx aCC CC cc++ FCC KCC RCC c++ g++ gpp" ;; +-esac +- +-AC_PROG_CXX($cxx_list) ++AC_PROG_CXX + AC_PROG_CC + + +-CXX_PROG_NAME=`basename $CXX` +-case $host in +- powerpc*-*-*) +- case "$CXX_PROG_NAME" in +- xlC*) +- REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict" +- ;; +- esac +- ;; +- i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*) +- case "$CXX_PROG_NAME" in +- icc|icpc|ecc) +- REQ_CXXFLAGS="$REQ_CXXFLAGS -mp" +- if test "$enable_warnings" = "yes"; then +- CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419" +- fi +- ;; +- esac +- ;; +- alpha*-*-*) +- case "$CXX_PROG_NAME" in +- cxx) +- CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak" +- ;; +- esac +- ;; +-esac +- +-AC_SUBST(REQ_CXXFLAGS) +-CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS" +- + if test "$enable_warnings" = "yes"; then + if test "$GCC" = "yes"; then + CXXFLAGS="$CXXFLAGS -Wall" +-- +2.31.1 + diff --git a/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch b/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch new file mode 100644 index 000000000000..7c36b768d6e9 --- /dev/null +++ b/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch @@ -0,0 +1,27 @@ +From 8d9e74e71cd2c0878c85b3559eeb66ec5020a99b Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:36:23 -0400 +Subject: [PATCH 11/12] qd-config.in: remove @REQ_CXXFLAGS@. + +We no longer compute REQ_CXXFLAGS in configure.ac, so this commit +removes the empty variable from qd-config.in. +--- + qd-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qd-config.in b/qd-config.in +index 3abfcb7..56bc960 100644 +--- a/qd-config.in ++++ b/qd-config.in +@@ -14,7 +14,7 @@ builddir="@abs_top_builddir@" + build_CXXFLAGS="@CXXFLAGS@" + build_LDFLAGS="@LDFLAGS@" + CXX="@CXX@" +-CXXFLAGS="-I$includedir @REQ_CXXFLAGS@" ++CXXFLAGS="-I$includedir" + FC="@FC@" + + LDFLAGS="-L$libdir -lqd @LIBS@" +-- +2.31.1 + diff --git a/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch b/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch new file mode 100644 index 000000000000..a7cb94077f84 --- /dev/null +++ b/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch @@ -0,0 +1,55 @@ +From b02e5c5403b1ac88b1fd606f3c1147330c47700c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 4 Aug 2021 19:38:31 -0400 +Subject: [PATCH 12/12] configure.ac: remove the --enable-warnings flag. + +This flag simply adds "-Wall" to $CXXFLAGS when it is enabled and the +value of the $GCC variable is true. Given how easy it is to run + + CXXFLAGS=-Wall ./configure + +(which uses standard knowledge) compared to + + ./configure --enable-warnings + +(which does not), I don't think this flag warrants the extra complexity +in configure.ac. This commit removes the option. +--- + configure.ac | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5ac7079..46640e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,27 +62,12 @@ fi + AC_MSG_RESULT($enable_sloppy_div) + + +-# --enable-warnings +-AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]])) +-AC_MSG_CHECKING([if compiler warnings is to be enabled]) +-if test "$enable_warnings" != "yes"; then +- enable_warnings="no" +-fi +-AC_MSG_RESULT($enable_warnings) +- +- + # Checks for programs. + AC_LANG(C++) + AC_PROG_CXX + AC_PROG_CC + + +-if test "$enable_warnings" = "yes"; then +- if test "$GCC" = "yes"; then +- CXXFLAGS="$CXXFLAGS -Wall" +- fi +-fi +- + # --enable-fma + AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]])) + if test "x$enable_fma" = "x"; then +-- +2.31.1 + diff --git a/sci-libs/qd/qd-2.3.22-r1.ebuild b/sci-libs/qd/qd-2.3.22-r1.ebuild new file mode 100644 index 000000000000..3baf812eeb53 --- /dev/null +++ b/sci-libs/qd/qd-2.3.22-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +FORTRAN_NEEDED=fortran + +inherit autotools fortran-2 + +DESCRIPTION="Quad-double and double-double float arithmetics" +HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/" +SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran" + +PATCHES=( + "${FILESDIR}/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch" + "${FILESDIR}/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch" + "${FILESDIR}/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch" + "${FILESDIR}/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch" + "${FILESDIR}/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch" + "${FILESDIR}/0006-configure.ac-remove-enable-debug-flag.patch" + "${FILESDIR}/0007-config.h.in-remove-QD_DEBUG-constant.patch" + "${FILESDIR}/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch" + "${FILESDIR}/0009-configure.ac-don-t-set-CC-to-CXX.patch" + "${FILESDIR}/0010-configure.ac-don-t-manually-search-for-compiler-name.patch" + "${FILESDIR}/0011-qd-config.in-remove-REQ_CXXFLAGS.patch" + "${FILESDIR}/0012-configure.ac-remove-the-enable-warnings-flag.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --disable-ieee-add \ + --disable-sloppy-mul \ + --disable-sloppy-div \ + --enable-inline \ + $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \ + $(use_enable fortran) +} + +src_install() { + default + + dosym qd_real.h /usr/include/qd/qd.h + dosym dd_real.h /usr/include/qd/dd.h + + if ! use doc; then + rm "${ED}"/usr/share/doc/${PF}/*.pdf || die + fi + + find "${D}" -name '*.la' -delete || die +} diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 338a5d4c5f60..3a54a8235e24 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,5 +1,4 @@ -AUX pcl.patch 1093 BLAKE2B 16faab539f13f54db1518babe02d208b438d984fd462098ac4c1babc9b6f509e14b307c58f59e66a177e66bdaadd8ccc3e509aac9da4c207104f0a967e790843 SHA512 5a5b97f9c028adff316ad50cf4e002b54d8603f3394d631330109c986b7184aaae6cba08e2bbcc1c21f9b97f77fbabe2fab344fa1119b47a1c24a774ed637bd6 -DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7 -EBUILD rtabmap-0.20.3.ebuild 1462 BLAKE2B c01fe814a8d4c300705bbf4116633d5e9670274cfcadda21ef38139111e35a0d37fb147800dabe36ab48bcfb1796f1ea35fad285661e4a53745c961f7dc9cb2e SHA512 aa238a9379b985357223cd9356d6effb5344a4f5c627d747207e2bca0e2cb8127a35ad5a63852cabd5b52a7461fcc41279f6416b4b03ca762968f0e1408bae38 -EBUILD rtabmap-9999.ebuild 1426 BLAKE2B 8f75d91b8b718f4aa724b9e3b3b2abd38e84760606818eb4d1d1f26958aadd7f907e0b43cad24a0f3e132e83d19efcce15960d8f9b8235d4c08976ebb0496973 SHA512 291b0a6427444d18a36aa883e83c4a42696080caea646b8e44f2236a1f74c9ec361cf5022e346c11fa621185b672c6fbfc76de5022da1908b8ef95757267feb6 +DIST rtabmap-0.20.13.tar.gz 21501493 BLAKE2B eddec6e4812cea231f88263ce136eb535bc099939a482d6fb6de0e6ab3a302c395eb5f6c824d04da8d48a7f7ad9d63b8fa313ae3c21dcada74ec89c7e8130af5 SHA512 4014ec3b7bc2edbd7f361026d5a4be9222b094e398fde68512aab37b3edcb01d47256e4931de6ea1b3bcada9ac81405946e85e774220b9cf43d14a2db6c91118 +EBUILD rtabmap-0.20.13.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304 +EBUILD rtabmap-9999.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81 diff --git a/sci-libs/rtabmap/files/pcl.patch b/sci-libs/rtabmap/files/pcl.patch deleted file mode 100644 index 249d93d1c595..000000000000 --- a/sci-libs/rtabmap/files/pcl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 24052a6ebe65fb260ee1d838ca5305b12b15d928 Mon Sep 17 00:00:00 2001 -From: matlabbe <matlabbe@gmail.com> -Date: Tue, 25 Aug 2020 10:56:30 -0400 -Subject: [PATCH] fixed pcl::getAngle3D not found error on latest pcl version - (https://github.com/PointCloudLibrary/pcl/commit/6df3e602a72ea16657f901c9a6911d95b263ba08#diff-8e08415b9972a447d115dbca3f8fa0a1) - ---- - corelib/src/pcl18/surface/impl/texture_mapping.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/corelib/src/pcl18/surface/impl/texture_mapping.hpp b/corelib/src/pcl18/surface/impl/texture_mapping.hpp -index a30f5766f..fbeedb221 100644 ---- a/corelib/src/pcl18/surface/impl/texture_mapping.hpp -+++ b/corelib/src/pcl18/surface/impl/texture_mapping.hpp -@@ -41,6 +41,7 @@ - #include <pcl/common/distances.h> - #include <pcl18/surface/texture_mapping.h> - #include <pcl/search/octree.h> -+#include <pcl/common/common.h> // for getAngle3D - - /////////////////////////////////////////////////////////////////////////////////////////////// - template<typename PointInT> std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > diff --git a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild index 38dc4acd24e8..906a00d0ba74 100644 --- a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild +++ b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild @@ -9,14 +9,16 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/introlab/rtabmap" fi -inherit ${SCM} cmake-utils multilib +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}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P}" + 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)" @@ -43,7 +45,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/pcl.patch" ) src_configure() { local mycmakeargs=( @@ -52,11 +53,11 @@ src_configure() { "-DWITH_OPENNI2=$(usex openni2 ON OFF)" "-DBUILD_EXAMPLES=$(usex examples ON OFF)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_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} diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild index d05ebf85b047..906a00d0ba74 100644 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild +++ b/sci-libs/rtabmap/rtabmap-9999.ebuild @@ -9,14 +9,16 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/introlab/rtabmap" fi -inherit ${SCM} cmake-utils multilib +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}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P}" + 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)" @@ -51,11 +53,11 @@ src_configure() { "-DWITH_OPENNI2=$(usex openni2 ON OFF)" "-DBUILD_EXAMPLES=$(usex examples ON OFF)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_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} diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 61c5072a121d..cbb6f6edd974 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -17,5 +17,5 @@ DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317 DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4 EBUILD vtk-8.2.0-r4.ebuild 10333 BLAKE2B 834bac0a4f2a2ebb770a67b62dab0240c45588ddebf5939e4e0557441750c8a83cb76ecee02a3841673e2749ffd628ea8e611f9327c214c01a95eeb5dd23fd75 SHA512 26c1bf583d835717950cd0f5842eb358ed31728484c906b9122e5cb72b72f0255f73f6a52974d098eebe2af6af9a72aa4b369148cf47d1ca994ebd6dfcd3f68a -EBUILD vtk-9.0.1.ebuild 13679 BLAKE2B 4b46f2a93590a6f7403e9ca4d491d632e2ca9bbc0ba0f45c5a4c541cb2bf351e69f9b498edfc46ecfd84e2c1eaef5673c035ee050b584844e3e665fbca2e031d SHA512 4515771d506b19696467eeb0146dffeacca46df9310ca3c1176c80f050dee05b189c109b12e508822478b820e1a247eb0ae16542ac23ed86d3330c6224875acb +EBUILD vtk-9.0.1.ebuild 14476 BLAKE2B 2e67bbb40a0b63df76193c8d3883b35180e84c6a97b65ac551017a6e32340a67433d2f34db1f912996d5c6a138816d7efb5f3fe39e2c892c421c4395e650df0b SHA512 bfa4a2d152b81e52cf0bec0fb41b35985df7e8ff0a11385b3907bd93a8745a3e5726819f84edc5b63d0a30afdcd5d065dd70afed077de64234904602ed7bbd90 MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1 diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild index 6e0717f814c3..a38e3f1c3270 100644 --- a/sci-libs/vtk/vtk-9.0.1.ebuild +++ b/sci-libs/vtk/vtk-9.0.1.ebuild @@ -41,7 +41,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering theora views ) - cuda? ( X ) + cuda? ( X video_cards_nvidia ) java? ( rendering ) python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( X rendering ) @@ -294,7 +294,28 @@ src_configure() { fi if use cuda; then - mycmakeargs+=( -DVTKm_CUDA_Architecture="native" ) + local cuda_arch= + case ${VTK_CUDA_ARCH:-native} in + # we ignore fermi arch, because current nvidia-cuda-toolkit-11* + # no longer supports it + kepler|maxwell|pascal|volta|turing|ampere|all) + cuda_arch=${VTK_CUDA_ARCH} + ;; + native) + ewarn "If auto detection fails for you, please try and export the" + ewarn "VTK_CUDA_ARCH environment variable to one of the common arch" + ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all." + cuda_arch=native + ;; + *) + eerror "Please properly set the VTK_CUDA_ARCH environment variable to" + eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all" + die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!" + ;; + esac + ewarn "Using CUDA architecture '${cuda_arch}'" + + mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} ) fi if use ffmpeg; then |