diff options
Diffstat (limited to 'sci-libs')
175 files changed, 3348 insertions, 3692 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 48211c131d35..3de45ddcca3d 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest index d72cc9b2d475..e57bd4f5ff84 100644 --- a/sci-libs/ViSP/Manifest +++ b/sci-libs/ViSP/Manifest @@ -1,5 +1,5 @@ AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff DIST visp-3.5.0.tar.gz 52005297 BLAKE2B a429c07c8d80e8790bdd72bf27b777c79784173cc8be2539656c1cfbc111e35b3f80207a866fe3aaca536033af9e9d5006bf7e10a56cef5655aa9615a674c5ac SHA512 5a968a78c8ed2c48da71fa3def482b84fd73961f012e82ea1d7dd9b7b14336be5596ac9fc1bdf16414793d2399431bbc4306710d31b62946e6b2c03f692751b8 -EBUILD ViSP-3.5.0.ebuild 2879 BLAKE2B 5c9eb22ec47648131fa455005669eb4ed1358effa398b33c73a88b48fca7f7fb2f5638e4a89518480d49f552a0fb43d777899a1fb8832f768fd4a1dff95b4d87 SHA512 ee6ae9e188f1f7fa60cef6048da6eeff7c70b931cba47fbbe49068c7dbbccdc0d5dfc4c3cfabc593d950ded8ca5e6ec531798ed5f09095954fa180f4c2ea5a57 +EBUILD ViSP-3.5.0-r1.ebuild 2972 BLAKE2B 58cf789eac70ba221b6c9acdec74278aebd12eb3e78be19d0961f17a8e09d63539644123bdfe7efed46cb835574e2fe00bbb18857e70c321a6bccad3f07bf2e4 SHA512 8ae7dfda52eaa227185382e5a0808c19a7334ff18a11eb3ef3cadadf583d6c9853c71cf87a03d228268864b97947e161c423bb286f59f72403515fe44b4b1aca MISC metadata.xml 1384 BLAKE2B 5146b30499cd534556ef2b6f9048535296f38e5ae2dd2dca9670799de61cf666b74ec2ed602a35c56df839317221200129ef71fcf6c6026fe7d74a14ac70dd9c SHA512 4dbd648e138eea6bdb7a97d2eb32f1df909afa7a4922b4ffff356e511a4d73fa0095b65c3b70100c81436b1f9636f9190fedc98ced52c13db0f1d86ca86d9f66 diff --git a/sci-libs/ViSP/ViSP-3.5.0.ebuild b/sci-libs/ViSP/ViSP-3.5.0-r1.ebuild index 5a7052834f6b..a8833954122d 100644 --- a/sci-libs/ViSP/ViSP-3.5.0.ebuild +++ b/sci-libs/ViSP/ViSP-3.5.0-r1.ebuild @@ -21,6 +21,7 @@ REQUIRED_USE="motif? ( coin )" RESTRICT="!test? ( test )" COMMON_DEPEND=" + virtual/lapack coin? ( >=media-libs/coin-4 virtual/opengl @@ -76,6 +77,9 @@ src_configure() { "-DUSE_GSL=$(usex gsl ON OFF)" "-DUSE_JPEG=$(usex jpeg ON OFF)" "-DUSE_PNG=$(usex png ON OFF)" + "-DUSE_LAPACK=ON" + # disable using the builtin copy + "-DWITH_LAPACK=OFF" "-DUSE_LIBUSB_1=$(usex usb ON OFF)" "-DUSE_OGRE=$(usex ogre ON OFF)" "-DUSE_OIS=$(usex ogre ON OFF)" diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 57fe08eee51b..45c169a56210 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -3,4 +3,4 @@ DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f85 DIST armadillo-12.8.2.tar.xz 6996368 BLAKE2B 63876486dcd72359b243a2ae217de751a9033c7f3e6c8599ba195b52fb493dbc4b6ec7f804916d40cef0c726d3ad42752a5cfb6fd3919935cbdf20e59488e474 SHA512 33bfe6f1fae2ef18ec3286742264dedd67730e47b5187568cb2fbe951286a5a8534a4b577894cc44415887241a46afb25b3fcf2b249ef15f9b71045e98fd0132 EBUILD armadillo-12.4.0-r1.ebuild 3294 BLAKE2B ce1fc43065ec5fefd359aa10d1200e8a6cd3eaa8a638338f6e1a2c663968a2d40af7f185bffd591331c2609527b56466626cdccb8f2439a469163ef159691cb9 SHA512 7e73bad5eb4eb99c6eb0c69c78ed0a8fe5c58655213fab4c418c77261840086418b44f2b1a0c663070e3b8e1f7e7291c887ea5a2d77ad77ad7fa90f14bdceeb9 EBUILD armadillo-12.8.2.ebuild 3296 BLAKE2B e161d17708dd03a41aca4003d0af3e258c455315d462cb0d0b598613b1821f8cae38e944bf8b824a49341d00dd8305500f7a676c237a12bd7c1e0eab39fb5f3a SHA512 bdd184b59a8e506620ca9ab359e6f02d09948120a88bf3243264f78679963df6f6917d0c0877408a4ceae9014994da6732d88b3f668070a32667413f7d27cc74 -MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0 +MISC metadata.xml 1525 BLAKE2B 3d1af2e67d98a9597d1b5dc6e49693a9712cb7c2d6712ae8e54635cd729504496dd65082528a5132907493a41b06be7bb83b93d3145831b978a315baef5b0a58 SHA512 2731e9bdc333b5d2867083f163dbcc54670a3a35ab1643fb63fa52732ed7fe5d4511330c5242eafd4f5bc111050482c836ce653ebc55d2c688f4cae5d29efa93 diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml index 08c60223686b..206c77590ec9 100644 --- a/sci-libs/armadillo/metadata.xml +++ b/sci-libs/armadillo/metadata.xml @@ -34,5 +34,6 @@ </use> <upstream> <remote-id type="sourceforge">arma</remote-id> + <remote-id type="gitlab">conradsnicta/armadillo-code</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest index 5f68dcd06051..4cda34da9815 100644 --- a/sci-libs/atlas/Manifest +++ b/sci-libs/atlas/Manifest @@ -1,6 +1,12 @@ AUX atlas-3.10.2-format-security.patch 8872 BLAKE2B 146136803b7c62f40847e6dbc3acc9422c5fda23383c0fb672b7bb34581898c852756992905d28f7ad1321cefd3ac027958e77971501030157d8e4e1f04d29c2 SHA512 151add96a1e34f99eb37d83e31018797a5737cf9e1ffb9d2fa459f9811dabae1e8fada3a8790618fd24abc7a43255b3694d4f3b9775d3478f1ffe4bc9c314252 AUX atlas-3.10.2-x32-support.patch 3410 BLAKE2B ba2f45ef71805d51aef7280876a825f522ac7eaa6210d1283be3a8a62cf2a0511003c9127393360a43010d29e86467f1c8bbf3be2bebaa37123313a77268e113 SHA512 ba30f795031457a4416978fadd76870aa09fa7af93f10bc5f0258a44d98151fa37c72813a999048927fc9a521e52d2eb9f01b4f7423baa4d0bad099eb0ee06cb +AUX atlas-3.10.3-fix-ancient-c.patch 8185 BLAKE2B cf8e922aa19276162e19ca671acbe9e5e469d5a8520ddc01fd24d269535c31afd0da98465f835ba5726865b97f34f7c5b39ea65008f3e0ef4b42f6311620ccbf SHA512 c8b423eebaeb42130f61f622e8d0bf5555b5560cf1e859a1b1b7781ff042d1570425a44df48d5826a4ef7f99e6ad47c88231471ef68eba0e67de8d88058a7ec4 DIST atlas3.10.2.tar.bz2 4904923 BLAKE2B e2fb0d307907549644cb678c32c4befce7ce6809c348a11fa6084e17d696da8681b3388dd63d8bdee6040999d9ab38a75f1788b42640121a536eb5f13e6f8939 SHA512 9fe04cfa1f89449db047d1a4659a656964d13117c783cbbe43344eb32555736f037d9cd30c5ae1514c08ad5b8949a3982d7fe102d707ddb62288e76b2607fbb1 +DIST atlas3.10.3.tar.bz2 5156852 BLAKE2B cd3880a6d0c43b5840d4da26ac996cc9fe7615fc996229193ef1f936daa2c54c5465643def19f59dd5c481c447176e2ba3cf85d38c0b5008c2dc1bc18be0e65b SHA512 bf17306f09f2aa973cb776e2c9eacfb2409ad4d95d19802e1c4e0597d0a099fccdb5eaafe273c2682a41e41a3c6fabc8bbba4ce03180cffea40ede5df1d1f56e +DIST atlas3.11.41.tar.bz2 6644195 BLAKE2B c046725f1a8978e345cb59026b93029483ecdfa0151256cca5dcdd337ced2a63819c19319795b663cd12180e8be0db475a3d1c1a5d76296ef333f99887d9e44a SHA512 06306c588505dcf22a1afa0f57d85b0008728deb5876e66b2710fee29712b979aa63eafc9142be2372b9895ba594cc5aba230aa3d1ddc95932af1e585478204d +DIST lapack-3.12.0.tar.gz 7933607 BLAKE2B dafb1f9a717f2cbc00a26f8cff2c7a1ebb720714fe6d7bd5fabb511a2f4af317165814340864c9d601e4e16c7762f643fbbafc058170ebcdc6529a9b4f2d70b6 SHA512 f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8 -EBUILD atlas-3.10.2.ebuild 5628 BLAKE2B 665ae5186574dad553800439446f63785df44977e94f10246c7913f4c16c650065771ab590f538ac5515ce986a29a3f40a57f363820ced5001b77aa4375fd084 SHA512 c01abb2b0af5f728a4a70de22862eaf58731fdafa3afcc3286cc73fb2d22e463967b8263ea977db4ca41173be84771ee57e7dd473a08d4ad651513d2e85cdcd7 +EBUILD atlas-3.10.2-r1.ebuild 5560 BLAKE2B 9502f57aac61fb78938406066ba56b61458f48c4bcc651ce605581bb16da29df245819a7f807b0863b190fc5e232ecdcb879e41eb98c8b1bccad332b6d5d2663 SHA512 324d20f0a666f3ee3a60a1c3a00831a141998c63e5cfe41f1750f1a3a67d0f987bb65cc22dbc638bd3a13c597c1fc66e1f04ebe9d5f69b61ab3a33f9dc24be43 +EBUILD atlas-3.10.3.ebuild 5891 BLAKE2B 3b9b82639d95f5031a67692177cbe789796dd9c7ffa2aad9d3e53078472fa13288462261e1b602474ad2d738cc4c6bf32ade3472c30b32026a12d59f7aa4b999 SHA512 9a27623f377b84b57dd36a0f093ba5ca0db996ee78255066b3f5e77184ca294e73f770a895ebc9b64407f99438a0bfa8ec65d8543a04c409de1637fa430d7902 +EBUILD atlas-3.11.41.ebuild 5887 BLAKE2B c91954f3843f50d532b90756dbf2ba436ead1d07e6066a01b5b4b2b8a20dfab4bdb6cfd1de98c3209285ccc871aa2fa7981c6eb199c08a429631e69917d9b0c3 SHA512 d890c1ab87bdca5014220d4558238877c3f191abf58c02e06eaec390f2327094e7bf7b1106f1257228fd26db14f3da40f01b09b34b7a2dee968202a8f8f90f59 MISC metadata.xml 935 BLAKE2B cf5e711f899988c36d4ffc63997c963a4ee30e7ac57de0415424e32699379d6595ac9e52cca8760f2b49af527d01b6a4e28bccdb762e5f9c220ae4da99899879 SHA512 5cb05a261bedbd08274d72ea3a4c2843fc39c0ca27d2b8e144310035feab40ec3abfd07438db062bc4c5fc7306be27ceb0fe97d1d24c68bea56683ceb55e7b9b diff --git a/sci-libs/atlas/atlas-3.10.2.ebuild b/sci-libs/atlas/atlas-3.10.2-r1.ebuild index 43582741de1a..88ac1701512c 100644 --- a/sci-libs/atlas/atlas-3.10.2.ebuild +++ b/sci-libs/atlas/atlas-3.10.2-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 FORTRAN_NEEDED=fortran -inherit fortran-2 toolchain-funcs versionator +inherit fortran-2 toolchain-funcs LAPACKP=lapack-3.6.0.tgz @@ -13,17 +13,13 @@ DESCRIPTION="Automatically Tuned Linear Algebra Software" HOMEPAGE="https://math-atlas.sourceforge.net" SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2 fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP} ) )" +S="${WORKDIR}/ATLAS" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc fortran generic lapack static-libs threads" -RDEPEND="" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/ATLAS" - PATCHES=( "${FILESDIR}/${P}-x32-support.patch" "${FILESDIR}/${P}-format-security.patch" @@ -48,9 +44,9 @@ src_configure() { [[ ${mycc} == *gcc* ]] && mycc=gcc atlas_configure() { local myconf=( - --prefix="${ED}/usr" - --libdir="${ED}/usr/$(get_libdir)" - --incdir="${ED}/usr/include" + --prefix="/usr" + --libdir="/usr/$(get_libdir)" + --incdir="/usr/include" --cc="$(tc-getCC)" "-D c -DWALL" "-C acg '${mycc}'" @@ -143,7 +139,7 @@ src_test() { atlas_install_libs() { local libname=$(basename ${1%.*}) einfo "Installing ${libname}" - local soname=${libname}.so.$(get_major_version) + local soname=${libname}.so.$(ver_cut 1) shift pushd "${S}_shared"/lib > /dev/null ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \ diff --git a/sci-libs/atlas/atlas-3.10.3.ebuild b/sci-libs/atlas/atlas-3.10.3.ebuild new file mode 100644 index 000000000000..aa0e6a6826fb --- /dev/null +++ b/sci-libs/atlas/atlas-3.10.3.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 toolchain-funcs + +LAPACKPV=3.12.0 + +DESCRIPTION="Automatically Tuned Linear Algebra Software" +HOMEPAGE="https://math-atlas.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2 + fortran? ( lapack? ( + https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACKPV}.tar.gz + -> lapack-${LAPACKPV}.tar.gz + ) ) +" +S="${WORKDIR}/ATLAS" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fortran generic lapack static-libs threads" + +PATCHES=( + "${FILESDIR}/${PN}-3.10.2-x32-support.patch" + "${FILESDIR}/${PN}-3.10.2-format-security.patch" + "${FILESDIR}/${PN}-3.10.3-fix-ancient-c.patch" +) + +pkg_setup() { + local _cpufreq + for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do + if [[ -f ${_cpufreq} ]]; then + if ! grep -q performance "${_cpufreq}"; then + echo 2> /dev/null performance > "${_cpufreq}" || \ + die "${PN} needs all cpu set to performance" + fi + fi + done + use fortran && fortran-2_pkg_setup +} + +src_configure() { + # hack needed to trick the flaky gcc detection + local mycc + mycc="$(type -P "$(tc-getCC)")" + [[ ${mycc} == *gcc* ]] && mycc=gcc + atlas_configure() { + local myconf=( + --cripple-atlas-performance + --prefix="/usr" + --libdir="/usr/$(get_libdir)" + --incdir="/usr/include" + --cc="$(tc-getCC)" + "-D c -DWALL" + "-C acg '${mycc}'" + "-F acg '${CFLAGS}'" + "-Ss pmake '\$(MAKE) ${MAKEOPTS}'" + ) + + # OpenMP shown to decreased performance over POSIX threads + # (at least in 3.9.x, see atlas-dev mailing list) + if use threads; then + if use generic; then # 2 threads is most generic + myconf+=( "-t 2" "-Si omp 0" ) + else + myconf+=( "-t -1" "-Si omp 0" ) + fi + else + myconf+=( "-t 0" "-Si omp 0" ) + fi + + if use amd64 || use ppc64 || use sparc; then + if [[ ${ABI} = amd64 ]] || [[ ${ABI} = ppc64 ]] || [[ ${ABI} = sparc64 ]] ; then + myconf+=( "-b 64" ) + elif [[ ${ABI} = x86 ]] || [[ ${ABI} = ppc ]] || [[ ${ABI} = sparc32 ]] ; then + myconf+=( "-b 32" ) + elif [[ ${ABI} = x32 ]] ; then + myconf+=( "-b 48" ) + else + myconf+=( "-b 64" ) + fi + elif use ppc || use x86; then + myconf+=( "-b 32" ) + elif use ia64; then + myconf+=( "-b 64" ) + fi + if use fortran; then + myconf+=( + "-C if '$(type -P "$(tc-getFC)")'" + "-F if '${FFLAGS}'" + ) + if use lapack; then + myconf+=( + "-Si latune 1" + "--with-netlib-lapack-tarfile=${DISTDIR}/lapack-${LAPACKPV}.tar.gz" + ) + else + myconf+=( "-Si latune 0" ) + fi + else + myconf+=( "-Si latune 0" "--nof77" ) + fi + # generic stuff found by make make xprint_enums in atlas build dir + # basically assuming sse2+sse1 and 2 threads max + use generic && use x86 && myconf+=( "-V 384 -A 13") + use generic && use amd64 && myconf+=( "-V 384 -A 24") + + local confdir="${S}_${1}"; shift + myconf+=( $@ ) + mkdir "${confdir}" || die + cd "${confdir}" || die + # for debugging + echo "${myconf[@]}" > myconf.out + "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed" + } + + atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF} + use static-libs && atlas_configure static ${EXTRA_ECONF} +} + +src_compile() { + atlas_compile() { + pushd "${S}_${1}" > /dev/null || die + # atlas does its own parallel builds + emake -j1 build + cd lib || die + emake libclapack.a + [[ -e libptcblas.a ]] && emake libptclapack.a + popd > /dev/null || die + } + + atlas_compile shared + use static-libs && atlas_compile static +} + +src_test() { + cd "${S}_shared" || die + emake -j1 check time +} + +# transform a static archive into a shared library and install them +# atlas_install_libs <mylib.a> [extra link flags] +atlas_install_libs() { + local libname soname + libname=$(basename "${1%.*}") + einfo "Installing ${libname}" + soname=${libname}.so.$(ver_cut 1) + shift + pushd "${S}_shared"/lib > /dev/null || die + ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared "-Wl,-soname=${soname}" \ + -Wl,--whole-archive "${libname}.a" -Wl,--no-whole-archive \ + $@ -o "${soname}" || die "Creating ${soname} failed" + dolib.so "${soname}" + ln -s "${soname}" "${soname%.*}" + dosym "${soname}" "/usr/$(get_libdir)/${soname%.*}" + popd > /dev/null || die + use static-libs && dolib.a "${S}_static/lib/${libname}.a" +} + +src_install() { + cd "${S}_shared/lib" || die + # rename to avoid collision with other packages + local l + for l in {,c}{blas,lapack}; do + if [[ -e lib${l}.a ]]; then + mv lib{,atl}"${l}.a" + use static-libs && mv "${S}"_static/lib/lib{,atl}"${l}.a" + fi + done + + [[ -e libptcblas.a ]] && PTLIBS="-lpthread" + + # atlas + atlas_install_libs libatlas.a -lm "${PTLIBS}" + + # cblas + atlas_install_libs libatlcblas.a -lm -L. -latlas + + # cblas threaded + [[ -e libptcblas.a ]] && \ + atlas_install_libs libptcblas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # clapack + atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas + + # clapack threaded + [[ -e libptclapack.a ]] && \ + atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas "${PTLIBS}" + fi + + if use fortran; then + LINK=$(tc-getF77) + + # blas + atlas_install_libs libf77blas.a -lm -L. -latlas + + # blas threaded + [[ -e libptf77blas.a ]] && \ + atlas_install_libs libptf77blas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # lapack + atlas_install_libs libatllapack.a \ + -lm -L. -latlas -latlcblas -lf77blas + # lapack threaded + [[ -e libptlapack.a ]] && \ + atlas_install_libs libptlapack.a -lm -L. -latlas -lptcblas -lptf77blas "${PTLIBS}" + fi + fi + + cd "${S}" || die + insinto "/usr/include/${PN}" + doins include/*.h + + cd "${S}/doc" || die + dodoc INDEX.txt AtlasCredits.txt ChangeLog + use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf + use doc && use fortran && dodoc f77blas*pdf + use doc && use fortran && use lapack && dodoc -- *lapack*pdf +} diff --git a/sci-libs/atlas/atlas-3.11.41.ebuild b/sci-libs/atlas/atlas-3.11.41.ebuild new file mode 100644 index 000000000000..f4a8920320ab --- /dev/null +++ b/sci-libs/atlas/atlas-3.11.41.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 toolchain-funcs + +LAPACKPV=3.12.0 + +DESCRIPTION="Automatically Tuned Linear Algebra Software" +HOMEPAGE="https://math-atlas.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2 + fortran? ( lapack? ( + https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACKPV}.tar.gz + -> lapack-${LAPACKPV}.tar.gz + ) ) +" +S="${WORKDIR}/ATLAS" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fortran generic lapack static-libs threads" + +PATCHES=( + # TODO These don't apply, find out why + # "${FILESDIR}/${PN}-3.10.2-x32-support.patch" + # "${FILESDIR}/${PN}-3.10.2-format-security.patch" +) + +pkg_setup() { + local _cpufreq + for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do + if [[ -f ${_cpufreq} ]]; then + if ! grep -q performance "${_cpufreq}"; then + echo 2> /dev/null performance > "${_cpufreq}" || \ + die "${PN} needs all cpu set to performance" + fi + fi + done + use fortran && fortran-2_pkg_setup +} + +src_configure() { + # hack needed to trick the flaky gcc detection + local mycc + mycc="$(type -P "$(tc-getCC)")" + [[ ${mycc} == *gcc* ]] && mycc=gcc + atlas_configure() { + local myconf=( + --cripple-atlas-performance + --prefix="/usr" + --libdir="/usr/$(get_libdir)" + --incdir="/usr/include" + --cc="$(tc-getCC)" + "-D c -DWALL" + "-C acg '${mycc}'" + "-F acg '${CFLAGS}'" + "-Ss pmake '\$(MAKE) ${MAKEOPTS}'" + ) + + # OpenMP shown to decreased performance over POSIX threads + # (at least in 3.9.x, see atlas-dev mailing list) + if use threads; then + if use generic; then # 2 threads is most generic + myconf+=( "-t 2" "-Si omp 0" ) + else + myconf+=( "-t -1" "-Si omp 0" ) + fi + else + myconf+=( "-t 0" "-Si omp 0" ) + fi + + if use amd64 || use ppc64 || use sparc; then + if [[ ${ABI} = amd64 ]] || [[ ${ABI} = ppc64 ]] || [[ ${ABI} = sparc64 ]] ; then + myconf+=( "-b 64" ) + elif [[ ${ABI} = x86 ]] || [[ ${ABI} = ppc ]] || [[ ${ABI} = sparc32 ]] ; then + myconf+=( "-b 32" ) + elif [[ ${ABI} = x32 ]] ; then + myconf+=( "-b 48" ) + else + myconf+=( "-b 64" ) + fi + elif use ppc || use x86; then + myconf+=( "-b 32" ) + elif use ia64; then + myconf+=( "-b 64" ) + fi + if use fortran; then + myconf+=( + "-C if '$(type -P "$(tc-getFC)")'" + "-F if '${FFLAGS}'" + ) + if use lapack; then + myconf+=( + "-Si latune 1" + "--with-netlib-lapack-tarfile=${DISTDIR}/lapack-${LAPACKPV}.tar.gz" + ) + else + myconf+=( "-Si latune 0" ) + fi + else + myconf+=( "-Si latune 0" "--nof77" ) + fi + # generic stuff found by make make xprint_enums in atlas build dir + # basically assuming sse2+sse1 and 2 threads max + use generic && use x86 && myconf+=( "-V 384 -A 13") + use generic && use amd64 && myconf+=( "-V 384 -A 24") + + local confdir="${S}_${1}"; shift + myconf+=( $@ ) + mkdir "${confdir}" || die + cd "${confdir}" || die + # for debugging + echo "${myconf[@]}" > myconf.out + "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed" + } + + atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF} + use static-libs && atlas_configure static ${EXTRA_ECONF} +} + +src_compile() { + atlas_compile() { + pushd "${S}_${1}" > /dev/null || die + # atlas does its own parallel builds + emake -j1 build + cd lib || die + emake libclapack.a + [[ -e libptcblas.a ]] && emake libptclapack.a + popd > /dev/null || die + } + + atlas_compile shared + use static-libs && atlas_compile static +} + +src_test() { + cd "${S}_shared" || die + emake -j1 check time +} + +# transform a static archive into a shared library and install them +# atlas_install_libs <mylib.a> [extra link flags] +atlas_install_libs() { + local libname soname + libname=$(basename "${1%.*}") + einfo "Installing ${libname}" + soname=${libname}.so.$(ver_cut 1) + shift + pushd "${S}_shared"/lib > /dev/null || die + ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared "-Wl,-soname=${soname}" \ + -Wl,--whole-archive "${libname}.a" -Wl,--no-whole-archive \ + $@ -o "${soname}" || die "Creating ${soname} failed" + dolib.so "${soname}" + ln -s "${soname}" "${soname%.*}" + dosym "${soname}" "/usr/$(get_libdir)/${soname%.*}" + popd > /dev/null || die + use static-libs && dolib.a "${S}_static/lib/${libname}.a" +} + +src_install() { + cd "${S}_shared/lib" || die + # rename to avoid collision with other packages + local l + for l in {,c}{blas,lapack}; do + if [[ -e lib${l}.a ]]; then + mv lib{,atl}"${l}.a" + use static-libs && mv "${S}"_static/lib/lib{,atl}"${l}.a" + fi + done + + [[ -e libptcblas.a ]] && PTLIBS="-lpthread" + + # atlas + atlas_install_libs libatlas.a -lm "${PTLIBS}" + + # cblas + atlas_install_libs libatlcblas.a -lm -L. -latlas + + # cblas threaded + [[ -e libptcblas.a ]] && \ + atlas_install_libs libptcblas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # clapack + atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas + + # clapack threaded + [[ -e libptclapack.a ]] && \ + atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas "${PTLIBS}" + fi + + if use fortran; then + LINK=$(tc-getF77) + + # blas + atlas_install_libs libf77blas.a -lm -L. -latlas + + # blas threaded + [[ -e libptf77blas.a ]] && \ + atlas_install_libs libptf77blas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # lapack + atlas_install_libs libatllapack.a \ + -lm -L. -latlas -latlcblas -lf77blas + # lapack threaded + [[ -e libptlapack.a ]] && \ + atlas_install_libs libptlapack.a -lm -L. -latlas -lptcblas -lptf77blas "${PTLIBS}" + fi + fi + + cd "${S}" || die + insinto "/usr/include/${PN}" + doins include/*.h + + cd "${S}/doc" || die + dodoc INDEX.txt AtlasCredits.txt ChangeLog + use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf + use doc && use fortran && dodoc f77blas*pdf + use doc && use fortran && use lapack && dodoc -- *lapack*pdf +} diff --git a/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch b/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch new file mode 100644 index 000000000000..5a8a257a1a9b --- /dev/null +++ b/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch @@ -0,0 +1,297 @@ +From 3d330dc50a608581c81d269b661af0c938155428 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:10:33 +0200 +Subject: [PATCH 1/5] main must return int + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/CONFIG/src/backend/archinfo_aix.c ++++ b/CONFIG/src/backend/archinfo_aix.c +@@ -180,7 +180,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_freebsd.c ++++ b/CONFIG/src/backend/archinfo_freebsd.c +@@ -243,7 +243,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_irix.c ++++ b/CONFIG/src/backend/archinfo_irix.c +@@ -198,7 +198,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_linux.c ++++ b/CONFIG/src/backend/archinfo_linux.c +@@ -571,7 +571,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_sfu.c ++++ b/CONFIG/src/backend/archinfo_sfu.c +@@ -151,7 +151,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_sunos.c ++++ b/CONFIG/src/backend/archinfo_sunos.c +@@ -212,7 +212,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_win.c ++++ b/CONFIG/src/backend/archinfo_win.c +@@ -221,7 +221,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_x86.c ++++ b/CONFIG/src/backend/archinfo_x86.c +@@ -460,7 +460,7 @@ int GetFlags(int nargs, char **args, int *CacheLevel) + return(flag); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int ierr, x86_64, flags, CacheLevel; + unsigned family, model; +--- a/bin/extract.c ++++ b/bin/extract.c +@@ -3904,7 +3904,7 @@ void HandleLine(EXTENV *EE, char *line) + } + + +-main(int nargs, char *args[]) ++int main(int nargs, char *args[]) + { + char line[LNLEN], *path; + int i; +--- a/bin/gpmmtst.c ++++ b/bin/gpmmtst.c +@@ -783,11 +783,11 @@ void GetFlags(int nargs, char *args[], int *TEST, + #endif + } + } +-___main(){} +-__main(){} +-MAIN__(){} +-_MAIN_(){} +-main(int nargs, char *args[]) ++int ___main(){} ++int __main(){} ++int MAIN__(){} ++int _MAIN_(){} ++int main(int nargs, char *args[]) + /* + * tst <tst> <# TA> <TA's> <# TB's> <TB's> <M0> <MN> <incM> <N0> <NN> <incN> + * <K0> <KN> <incK> <# alphas> <alphas> <# betas> <betas> +--- a/bin/invtst.c ++++ b/bin/invtst.c +@@ -743,7 +743,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + } + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, ldagap, nord, nuplo, N0, NN, incN; + enum TEST_UPLO *Uplo; +--- a/bin/llttst.c ++++ b/bin/llttst.c +@@ -538,7 +538,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + } + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN; + TYPE thresh; +--- a/bin/lutst.c ++++ b/bin/lutst.c +@@ -476,7 +476,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + if (*M0 == -1) *M0 = *MN = *incM = *MisN = 1; + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, LdaIsM, MisN, NisM, M0, MN, incM, N0, NN, incN; + int norders; +--- a/bin/slvtst.c ++++ b/bin/slvtst.c +@@ -743,7 +743,7 @@ static int DoAllTests(int nrep, int N0, int NN, int incN, int R0, int RN, + else fprintf(stdout, "\n%d TESTS RUN, %d FAILED!!\n\n", i, ierr); + return(ierr); + } +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int ierr, N0, NN, incN, R0, RN, incR, ldagap, ldbgap, nord, nuplo; + int CS, MFLOP, QR, nrep; +--- a/bin/uumtst.c ++++ b/bin/uumtst.c +@@ -566,7 +566,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + } + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN; + TYPE thresh; +--- a/lib/qr.c ++++ b/lib/qr.c +@@ -5,7 +5,7 @@ + #elif defined(UpCase) + #define dgeqrf_ DGEQRF + #endif +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + extern void dgeqrf_(F77_INTEGER*,F77_INTEGER*,double*,F77_INTEGER*, + double*,double*,F77_INTEGER*,F77_INTEGER*); +--- a/lib/test_dynlink.c ++++ b/lib/test_dynlink.c +@@ -1,6 +1,6 @@ + #include <cblas.h> + #include <clapack.h> +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + double A[1]={1.0}, b[1]={1.0}; + int ipiv[1]; +--- a/tune/sysinfo/masrch.c ++++ b/tune/sysinfo/masrch.c +@@ -169,7 +169,7 @@ int FindMflop + return(mf); + } + +-FindNreg ++int FindNreg + ( + char pre, /* precision: s,d,q */ + int fmf, /* number of mflops to force timer on */ +-- +2.45.2 + + +From 537f1afe821d5bad24fe401c8cb1294f2235f5b7 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:11:42 +0200 +Subject: [PATCH 2/5] add missing function declarations + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/CONFIG/include/atlconf_misc.h ++++ b/CONFIG/include/atlconf_misc.h +@@ -41,6 +41,8 @@ char *NameWithoutPath(char *file); + char *GetPathWithoutName(char *file); + void GetGccVers(char *gcc, int *comp, int *major, int *minor, int *patch); + int CompIsGcc(char *comp); ++int CompIsClang(char *comp); ++int CompIsMinGW(char *comp); + int CompIsAppleGcc(char *comp); + int CompIsMIPSpro(char *comp); + int CompIsPathScale(char *comp); +-- +2.45.2 + + +From 975b10d484ec2c18fcc3eccbdf30fd166f2072c3 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:11:49 +0200 +Subject: [PATCH 3/5] fix typo osnam -> osname + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/CONFIG/src/probe_arch.c ++++ b/CONFIG/src/probe_arch.c +@@ -198,7 +198,7 @@ int ConfirmPtrbits(enum OSTYPE OS0, enum ASMDIA asmd0, char *targ0, + /* + * Try OS-specific probe, compiling with -m64 (assumes gcc workalike) + */ +- i = 1 + strlen(frm) + strlen(osnam) + strlen(osnam[OS]) + ++ i = 1 + strlen(frm) + strlen(osname) + strlen(osnam[OS]) + + strlen(ASMNAM[asmd]) + strlen(flag) + strlen(targ) + strlen(find); + cmnd = malloc(i*sizeof(char)); + assert(cmnd); +-- +2.45.2 + + +From 550c8ff309c6896635bc86001af6dbecbf043d51 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:15:08 +0200 +Subject: [PATCH 4/5] use long long in format string + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/bin/atlas_install.c ++++ b/bin/atlas_install.c +@@ -278,7 +278,7 @@ long long GetFirstLongHex(char *ln) + { + if (isxdigit(ln[i])) + { +- sscanf(ln+i, "%lx", &iret); ++ sscanf(ln+i, "%llx", &iret); + break; + } + } +-- +2.45.2 + + +From 9a9d7f5f83ea6235ee8e40d49b93545bb3c5b7c2 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:16:03 +0200 +Subject: [PATCH 5/5] add missing string.h include + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/bin/qrtst.c ++++ b/bin/qrtst.c +@@ -41,6 +41,7 @@ + #ifndef TimeF77 + #include "clapack.h" + #endif ++#include <string.h> + + #ifdef ATL_FULL_LAPACK + #include "atlas_C2Flapack.h" +-- +2.45.2 + diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 79cf2c8c93df..f94847f10d56 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,20 +1,10 @@ -AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5 -AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a604856c66d91cb7518308422f7ffac82ffe183dc81becab27866814c06e321e97458ab6a6908aa01379299c7fdf8fdccf153 SHA512 1e2e4f646cec24b5373872865522a909d1c154623e232c06e3da361e4d29b8d7520c446f53fbf42aab5f00bab05d1f278ce9425e506a9a5ac73cbb10570bd325 -AUX caffe2-1.13.1-tensorpipe.patch 374 BLAKE2B 46d45aae88f99c213f0da039bad5aa0c470a6c505ed1d28088ecb8dd445547e52a6d2c087c52c15b20da31808cd9213c1e672880e9bf4afe9c487358b4d4cd9d SHA512 d7315408b3ad4630715c18fff853b07e589ae78f5fcc8eef7f8791202fca459a3b23481856a50a5d432aec26482eb33adf37ba0a37d45f719ceb29081449345d -AUX caffe2-2.0.0-cudnn_include_fix.patch 526 BLAKE2B 63959783a94bfa2b02f78e36e754ef6c54d9f3dfb0bfdedd0fb9ef6553204b54b2dfb1676312689bbc3eace897d5f0441faf9af376f27c3c831c3ffcece31e5d SHA512 ff2ba61a4c69620bb1078aa7235b015a6165bc0df65e5e4ec04d4f3515f80dc865cc904d279fefbc90784b571f41d82441ce8045a27947ae7d3d52505e813b3c -AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf38e8d7a20135e92465be28d3537f2d0b52c67a61b264e241539b64fa02aa99eefb856686a9f9e3c45291b8d6a70 SHA512 59e933c60abef3ac97a1e3b2cd7a9935f9fdde4bc3ed1c2c53c729af6d7ed735ffd38cbdac08d32c668cd2751f3f871cc833883efd19732c04a0f67fbb49c41d -AUX caffe2-2.1.2-fix-openmp-link.patch 483 BLAKE2B dfe9ae0978b71449486d12f769c3c962001c138bc53b0605ed6f2215fe732356da90c5084488bc4d9f54c88aab2a426b8c935543f7ba0890783bb58da30a5cb4 SHA512 a9cee8ae2a8477a21e92bd4ef286af68efd90283593db7ed4641a826b19b4266bcab9c131c93be2b6c2f13d5cd545c766612791cf2e23cff9a731a03f3ad7648 -AUX caffe2-2.1.2-fix-rpath.patch 510 BLAKE2B 6585e8089acc6e7fe69713ad04a64263ab2e9d2d5cf6d3a844dbbc917383e4b7a0688ebdfb3142e3c42108c8c14a6435f48ae4ce3adee8db338286d60ed7b503 SHA512 ede770559b487fff736aded0cf4b077d8308c2b85c5cd139150b04bcb8b72a0d78af6a2b74fbb153b75acff71df0832d8f139231d1c18558f5b5479af348e6a0 -AUX caffe2-2.1.2-rocm-fix-std-cpp17.patch 3485 BLAKE2B 38f07fa876e1b628f1709dc35669ee62bbd5b00e23880800a0c430c72365799da86213ba76d344e9b46559ec1a4c98e1be6b46466bee8ebbf484976c597bb5ba SHA512 8dffee073c7744c3eba62f22b5f11d1f5db980fd7e9ac593ae44b489fe1eded532739db397f4599b8cda1b75c26e493dff81c2862056f62823570ab94a8f3389 -AUX caffe2-2.2.1-gentoo.patch 6765 BLAKE2B 924338e5823825d18220c33e9168f96b5987350cf47ad26824c660dfe953f54c415a4a709d9d7bab6901687f41f8477c0615ab76773e0e689ecf91e9a7f2ef64 SHA512 e9a20bc83a1c0349927205fc3675b1ad832cb86acca3a8d2f68a3dd33f2c1fa39fb53616b603023dce217d0a29fef34e6abb6315201690a8568d2419bcb9d895 -AUX caffe2-2.2.2-musl.patch 363 BLAKE2B 9c62b8d93b430cec9d0e739802d5938933109369c003eda74fe1242d5bb61c50c70dd1cc52aa56d6b79c08f55328b991c8fafce60fa94d9377e84ddf14ab8d4a SHA512 2568001959399d76ce8a45e08dd54c0b297fc02a856b4d8a4003aa4dc12f5ded3e821022214df4997d4bd9de7515e0d2ebe2e465dca574b773155b8f9f5080f8 -AUX caffe2-2.3.0-CMakeFix.patch 519 BLAKE2B 0249b7c31cea647a0c82d94cd99fac3415cbd357aacde4d0cc0e5b936c27dc96afcbecdb9ae55ee464080603c9c71f6c995166ae7045e19e9d874dcf688b4a0a SHA512 a8c5200abf4f059a2c43a2fa0b2a639dde60cbf48f6bb461c133e02b7986e8bc9bb98c4a1c51478308ac13b886691c89debf0b762fc821cd52500f5648c3bd39 -AUX caffe2-2.3.0-cudnn_include_fix.patch 587 BLAKE2B 8ffeb9080ee77b953e7a77c9bea9af8c078adf147c314e07cf40d6f9ce1c988ac201e282ffd67a29703ced5885329d44be013c54cf3ba870c009aed40e65fefc SHA512 b37427e35d8147e603331eb344a3542ed31d0b133df3c7ce10ebecec93b1d09d040f77c33f23f70e9835db10fa209c0318b89b70b3b91263655d160ed737d6f3 -AUX caffe2-2.3.0-rocm-fix-std-cpp17.patch 3378 BLAKE2B 9e88fa1bf68c397c8122ea5b3504a22b3f6ef92c77dad8bd84ee03b4f75792b0e1281d8b1aa981ad1bf65060179fa08ef14e776e82abdec9147dfbb3bf37a7ae SHA512 7797a140abf736f2a4628cd727cf0c58ed39c9764b9ce3b67d17fc0c9b9965e647266c815e5322f96f807680120e25ccdbbc66b66c7c6cf84edb811330ad452c +DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 -EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 31ef525960d7c3866580985f9ba9736e5419f17c2a63251b8c4fe961a6789a33dee746b14b12fa331c8c20a6c821565b92dd2cb7c6cdd61678bba7ddf5fc7400 SHA512 f232d901c08e3fefd0d6260d07915786747df8f83269c3980c16112c968114c3cdb7daccd8132a6a3850a266a04b38f6df6d2b1f1bc35f473fb9a58d5fff3452 -EBUILD caffe2-2.3.0-r3.ebuild 7542 BLAKE2B 6b230db4d2a033b5078e8c61e40955a0981aa3b6b06734145e4bec8f78719329a3825218045a8f57efce9bfddad7b252ee4447d82cc0637db8656d5f8178b9cc SHA512 d3861111081d26a883790e7a5097ddf77ef2e491eb4471a3cc95d25e659ad8c283c22bda5674cb09d575768da5b6a401ea5347febd4f194dbedd4196d1ac628d -EBUILD caffe2-2.3.1.ebuild 7563 BLAKE2B 17433295ef6aaf94567a5261e9df6a2b5aeac0b2c18eb4c45375ed828cbba7ac874811c0da8ca51de84482d5e4b62b48ccecd8924ad42c72a1320ff8b3b715c6 SHA512 c6868b614f7a9c3847e32ba054d821e96486d57cdf1d4597d3a6bb6f9045bd19fa65d5462af31c471eafddd4d5e72278d68de59c21cb21ab17df381fd181fe10 +DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 +EBUILD caffe2-2.2.2-r1.ebuild 7494 BLAKE2B f09d96b6a6ab71366a3b30ac7f8e6d89a20bf6034fb0d055a59f7f1d31f2dd08742307790982ed1f2768305ccea094e5d1655a2ac7d6e91e24b5620c1ed3f0cd SHA512 a10afef393275946a0fa51b2303a1ceaf567e7df30ff96bdf3343d929c575038945f404cd75118d7f40f49ed8d03ef66a2d8a3aef10ede1b4b411f0efee2e56e +EBUILD caffe2-2.3.0-r3.ebuild 8468 BLAKE2B b3e5d3bdd08fb7c2beabb0de3244b9de125b283ebd2a1d8dbccdc863b912555726eb40649d67af8593eb64dc9e23f9d021174a0868751fb3a5daf26d98884740 SHA512 6123ad17b0b1de6bd8d8ae3a52a7f7205385e3d54faa5f2fdf4006a9255ac69413caf08f4ba2c79679edadbe5c94cb7c187d5b5f2dc3ed6682d7ae601881e86b +EBUILD caffe2-2.3.1.ebuild 8489 BLAKE2B 64b0ff8a65f46be8d3a80b4b4c47fb513eaaf78208e2d831ced3fcfa27f39cfa89d8648a64dea73a8b516476867f10cd04a4cb1873149659abe6114f88657ef4 SHA512 4bcb6fe1c3ab47879e57a453649866f8e5bf09da7cce6778de909447d6deb0ae0671512a1d182f5e275d246bb05c4553ff95bed490d4fd3f723653feae95b47e +EBUILD caffe2-2.4.0.ebuild 8194 BLAKE2B 4d5c12021cda76df3c8dab72ad3924b8e1d32f470e9b58df878a7c73f7fb64cb18993445babbbfeda83aabbedcfbf8a34bc08dc85a5766321847adba729584d2 SHA512 7d1fbe08b8077051ed359538a4a726e745fbaf4f4b4323bef566aefa246253b569710d4b87a09d18da50d333a0eff57dc28eea4583b8b17f7ac4a7c622b9587e MISC metadata.xml 1225 BLAKE2B ab7fb0bf8b2d37ddaa1a9ecc815eb094e85465d20d3a30af081b42e0b60ade9858d0053b101ba0e7750a90cb48b5b79db9bdc2729bf66d0420732489da62fe54 SHA512 dfb58597fb4bcdd7df0fcc3f2514518e118e8fc9b1cd24868aab60c32a62ff419b8b72a7c294925eff4c8871cc8df606af7fa60bfa99901091d8195101ee1153 diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild index 6649975ddf2d..773808bc4f76 100644 --- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild @@ -13,7 +13,8 @@ MYP=${MYPN}-${PV} DESCRIPTION="A deep learning framework" HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz" + -> ${MYP}.tar.gz + https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" S="${WORKDIR}"/${MYP} @@ -97,16 +98,16 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-gentoo.patch - "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch - "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch - "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch - "${FILESDIR}"/${PN}-2.0.0-gcc13.patch - "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch - "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch - "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch - "${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch - "${FILESDIR}"/${P}-musl.patch + ../patches/${PN}-2.2.1-gentoo.patch + ../patches/${PN}-1.13.0-install-dirs.patch + ../patches/${PN}-1.12.0-glog-0.6.0.patch + ../patches/${PN}-1.13.1-tensorpipe.patch + ../patches/${PN}-2.0.0-gcc13.patch + ../patches/${PN}-2.0.0-cudnn_include_fix.patch + ../patches/${PN}-2.1.2-fix-rpath.patch + ../patches/${PN}-2.1.2-fix-openmp-link.patch + ../patches/${PN}-2.1.2-rocm-fix-std-cpp17.patch + ../patches/${P}-musl.patch ) src_prepare() { diff --git a/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild index c01e904d8eb0..7fe4818311cb 100644 --- a/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -ROCM_VERSION=5.7 +ROCM_VERSION=6.1 inherit python-single-r1 cmake cuda flag-o-matic prefix rocm MYPN=pytorch @@ -13,7 +13,8 @@ MYP=${MYPN}-${PV} DESCRIPTION="A deep learning framework" HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz" + -> ${MYP}.tar.gz + https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" S="${WORKDIR}"/${MYP} @@ -65,18 +66,23 @@ RDEPEND=" opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( - >=dev-util/hip-5.7 - >=dev-libs/rccl-5.7[${ROCM_USEDEP}] - >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}] - >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}] - >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}] - >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}] - >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}] - >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}] - >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}] - >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}] - >=sci-libs/miopen-5.7[${ROCM_USEDEP}] - >=dev-util/roctracer-5.7[${ROCM_USEDEP}] + =dev-util/hip-6.1* + =dev-libs/rccl-6.1*[${ROCM_USEDEP}] + =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}] + =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}] + =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}] + =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}] + =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}] + =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}] + =sci-libs/miopen-6.1*[${ROCM_USEDEP}] + =dev-util/roctracer-6.1*[${ROCM_USEDEP}] + + amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] ) + amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] ) + amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] ) + amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] ) ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) @@ -101,16 +107,21 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-gentoo.patch - "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch - "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch - "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch - "${FILESDIR}"/${P}-cudnn_include_fix.patch - "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch - "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch - "${FILESDIR}"/${P}-rocm-fix-std-cpp17.patch - "${FILESDIR}"/${PN}-2.2.2-musl.patch - "${FILESDIR}"/${P}-CMakeFix.patch + ../patches/${PN}-2.2.1-gentoo.patch + ../patches/${PN}-1.13.0-install-dirs.patch + ../patches/${PN}-1.12.0-glog-0.6.0.patch + ../patches/${PN}-1.13.1-tensorpipe.patch + ../patches/${P}-cudnn_include_fix.patch + ../patches/${PN}-2.1.2-fix-rpath.patch + ../patches/${PN}-2.1.2-fix-openmp-link.patch + ../patches/${P}-rocm-fix-std-cpp17.patch + ../patches/${PN}-2.2.2-musl.patch + ../patches/${P}-CMakeFix.patch + ../patches/${PN}-2.3.0-exclude-aotriton.patch + ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch + ../patches/${PN}-2.3.0-optional-hipblaslt.patch + ../patches/${PN}-2.3.0-fix-libcpp.patch + ../patches/${PN}-2.3.0-fix-gcc-clang-abi-compat.patch ) src_prepare() { @@ -235,11 +246,20 @@ src_configure() { ) elif use rocm; then export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" + local use_hipblaslt="OFF" + if use amdgpu_targets_gfx90a || use amdgpu_targets_gfx940 || use amdgpu_targets_gfx941 \ + || use amdgpu_targets_gfx942; then + use_hipblaslt="ON" + fi mycmakeargs+=( -DUSE_NCCL=ON -DUSE_SYSTEM_NCCL=ON + -DUSE_HIPBLASLT=${use_hipblaslt} ) + + # ROCm libraries produce too much warnings + append-cxxflags -Wno-deprecated-declarations -Wno-unused-result fi if use onednn; then diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild index 51bab7c5dac7..ff2a9caebd59 100644 --- a/sci-libs/caffe2/caffe2-2.3.1.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -ROCM_VERSION=5.7 +ROCM_VERSION=6.1 inherit python-single-r1 cmake cuda flag-o-matic prefix rocm MYPN=pytorch @@ -13,7 +13,8 @@ MYP=${MYPN}-${PV} DESCRIPTION="A deep learning framework" HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz" + -> ${MYP}.tar.gz + https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" S="${WORKDIR}"/${MYP} @@ -65,18 +66,23 @@ RDEPEND=" opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( - =dev-util/hip-5.7* - =dev-libs/rccl-5.7*[${ROCM_USEDEP}] - =sci-libs/rocThrust-5.7*[${ROCM_USEDEP}] - =sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}] - =sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}] - =sci-libs/hipFFT-5.7*[${ROCM_USEDEP}] - =sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}] - =sci-libs/hipRAND-5.7*[${ROCM_USEDEP}] - =sci-libs/hipCUB-5.7*[${ROCM_USEDEP}] - =sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}] - =sci-libs/miopen-5.7*[${ROCM_USEDEP}] - =dev-util/roctracer-5.7*[${ROCM_USEDEP}] + =dev-util/hip-6.1* + =dev-libs/rccl-6.1*[${ROCM_USEDEP}] + =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}] + =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}] + =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}] + =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}] + =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}] + =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}] + =sci-libs/miopen-6.1*[${ROCM_USEDEP}] + =dev-util/roctracer-6.1*[${ROCM_USEDEP}] + + amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] ) + amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] ) + amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] ) + amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] ) ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) @@ -101,16 +107,21 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-gentoo.patch - "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch - "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch - "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch - "${FILESDIR}"/${PN}-2.3.0-cudnn_include_fix.patch - "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch - "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch - "${FILESDIR}"/${PN}-2.3.0-rocm-fix-std-cpp17.patch - "${FILESDIR}"/${PN}-2.2.2-musl.patch - "${FILESDIR}"/${PN}-2.3.0-CMakeFix.patch + ../patches/${PN}-2.2.1-gentoo.patch + ../patches/${PN}-1.13.0-install-dirs.patch + ../patches/${PN}-1.12.0-glog-0.6.0.patch + ../patches/${PN}-1.13.1-tensorpipe.patch + ../patches/${PN}-2.3.0-cudnn_include_fix.patch + ../patches/${PN}-2.1.2-fix-rpath.patch + ../patches/${PN}-2.1.2-fix-openmp-link.patch + ../patches/${PN}-2.3.0-rocm-fix-std-cpp17.patch + ../patches/${PN}-2.2.2-musl.patch + ../patches/${PN}-2.3.0-CMakeFix.patch + ../patches/${PN}-2.3.0-exclude-aotriton.patch + ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch + ../patches/${PN}-2.3.0-optional-hipblaslt.patch + ../patches/${PN}-2.3.0-fix-libcpp.patch + ../patches/${PN}-2.3.0-fix-gcc-clang-abi-compat.patch ) src_prepare() { @@ -235,11 +246,20 @@ src_configure() { ) elif use rocm; then export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" + local use_hipblaslt="OFF" + if use amdgpu_targets_gfx90a || use amdgpu_targets_gfx940 || use amdgpu_targets_gfx941 \ + || use amdgpu_targets_gfx942; then + use_hipblaslt="ON" + fi mycmakeargs+=( -DUSE_NCCL=ON -DUSE_SYSTEM_NCCL=ON + -DUSE_HIPBLASLT=${use_hipblaslt} ) + + # ROCm libraries produce too much warnings + append-cxxflags -Wno-deprecated-declarations -Wno-unused-result fi if use onednn; then diff --git a/sci-libs/caffe2/caffe2-2.4.0.ebuild b/sci-libs/caffe2/caffe2-2.4.0.ebuild new file mode 100644 index 000000000000..524dafcaacef --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.4.0.ebuild @@ -0,0 +1,290 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=6.1 +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs + +MYPN=pytorch +MYP=${MYPN}-${PV} + +DESCRIPTION="A deep learning framework" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz + -> ${MYP}.tar.gz + https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" + +S="${WORKDIR}"/${MYP} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + mpi? ( distributed ) + gloo? ( distributed ) + ?? ( cuda rocm ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) +" + +# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + >=dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-cpp/opentelemetry-cpp + dev-libs/protobuf:= + dev-libs/pthreadpool + dev-libs/sleef + virtual/lapack + sci-libs/onnx + sci-libs/foxi + cuda? ( + dev-libs/cudnn + >=dev-libs/cudnn-frontend-1.0.3:0/8 + <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] + ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) + gloo? ( sci-libs/gloo[cuda?] ) + mpi? ( virtual/mpi ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') ) + onednn? ( dev-libs/oneDNN ) + opencl? ( virtual/opencl ) + qnnpack? ( + !sci-libs/QNNPACK + dev-cpp/gemmlowp + ) + rocm? ( + =dev-util/hip-6.1* + =dev-libs/rccl-6.1*[${ROCM_USEDEP}] + =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}] + =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}] + =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}] + =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}] + =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}] + =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}] + =sci-libs/miopen-6.1*[${ROCM_USEDEP}] + =dev-util/roctracer-6.1*[${ROCM_USEDEP}] + + =sci-libs/hipBLASLt-6.1* + amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] ) + amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] ) + amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] ) + amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] ) + ) + distributed? ( sci-libs/tensorpipe[cuda?] ) + xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) +" +DEPEND=" + ${RDEPEND} + cuda? ( >=dev-libs/cutlass-3.4.1 ) + onednn? ( sci-libs/ideep ) + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + >=sci-libs/kineto-0.4.0_p20240525 + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + ../patches/${PN}-2.4.0-gentoo.patch + ../patches/${PN}-2.4.0-install-dirs.patch + ../patches/${PN}-1.12.0-glog-0.6.0.patch + ../patches/${PN}-1.13.1-tensorpipe.patch + ../patches/${PN}-2.3.0-cudnn_include_fix.patch + ../patches/${PN}-2.1.2-fix-rpath.patch + ../patches/${PN}-2.4.0-fix-openmp-link.patch + ../patches/${PN}-2.4.0-rocm-fix-std-cpp17.patch + ../patches/${PN}-2.2.2-musl.patch + ../patches/${PN}-2.4.0-exclude-aotriton.patch + ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch + ../patches/${PN}-2.3.0-fix-libcpp.patch +) + +src_prepare() { + filter-lto #bug 862672 + sed -i \ + -e "/third_party\/gloo/d" \ + cmake/Dependencies.cmake \ + || die + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd + # prefixify the hardcoded paths, after all patches are applied + hprefixify \ + aten/CMakeLists.txt \ + caffe2/CMakeLists.txt \ + cmake/Metal.cmake \ + cmake/Modules/*.cmake \ + cmake/Modules_CUDA_fix/FindCUDNN.cmake \ + cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \ + cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \ + cmake/public/LoadHIP.cmake \ + cmake/public/cuda.cmake \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + CMakeLists.txt + + if use rocm; then + sed -e "s:/opt/rocm:/usr:" \ + -e "s:lib/cmake:$(get_libdir)/cmake:g" \ + -e "s/HIP 1.0/HIP 1.0 REQUIRED/" \ + -i cmake/public/LoadHIP.cmake || die + + ebegin "HIPifying cuda sources" + ${EPYTHON} tools/amd_build/build_amd.py || die + eend $? + fi +} + +src_configure() { + if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then + ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." + ewarn "These may not be optimal for your GPU." + ewarn "" + ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," + ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." + ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5" + ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" + ewarn "" + ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" + ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" + fi + + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_DISTRIBUTED=$(usex distributed) + -DUSE_MPI=$(usex mpi) + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=$(usex fbgemm) + -DUSE_FLASH_ATTENTION=$(usex flash) + -DUSE_MEM_EFF_ATTENTION=OFF + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=$(usex gloo) + -DUSE_KINETO=OFF # TODO + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MKLDNN=$(usex onednn) + -DUSE_NNPACK=$(usex nnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex distributed) + -DUSE_PYTORCH_QNNPACK=$(usex qnnpack) + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENMP=$(usex openmp) + -DUSE_ROCM=$(usex rocm) + -DUSE_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_PYBIND11=ON + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -DPython_EXECUTABLE="${PYTHON}" + -DUSE_ITT=OFF + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_GLOO=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_SLEEF=ON + -DUSE_PYTORCH_METAL=OFF + -DUSE_XPU=OFF + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + if use mkl; then + mycmakeargs+=(-DBLAS=MKL) + elif use openblas; then + mycmakeargs+=(-DBLAS=OpenBLAS) + else + mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=) + fi + + if use cuda; then + addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" + addpredict "/proc/self/task" # bug 926116 + + mycmakeargs+=( + -DUSE_CUDNN=ON + -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" + -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + elif use rocm; then + export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" + + mycmakeargs+=( + -DUSE_NCCL=ON + -DUSE_SYSTEM_NCCL=ON + ) + + # ROCm libraries produce too much warnings + append-cxxflags -Wno-deprecated-declarations -Wno-unused-result + + if tc-is-clang; then + # fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656 + append-cxxflags -fclang-abi-compat=17 + fi + fi + + if use onednn; then + mycmakeargs+=( + -DUSE_MKLDNN=ON + -DMKLDNN_FOUND=ON + -DMKLDNN_LIBRARIES=dnnl + -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" + ) + fi + + cmake_src_configure + + # do not rerun cmake and the build process in src_install + sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die +} + +src_install() { + cmake_src_install + + insinto "/var/lib/${PN}" + doins "${BUILD_DIR}"/CMakeCache.txt + + rm -rf python + mkdir -p python/torch/include || die + mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die + cp torch/version.py python/torch/ || die + python_domodule python/caffe2 + python_domodule python/torch + ln -s ../../../../../include/torch \ + "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 +} diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch deleted file mode 100644 index 6c06d2cca654..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/pytorch/pytorch/issues/58054 - ---- a/c10/util/Logging.cpp -+++ b/c10/util/Logging.cpp -@@ -192,23 +192,13 @@ - google::GLOG_WARNING, - "The minimum log level that caffe2 will output."); - --// Google glog's api does not have an external function that allows one to check --// if glog is initialized or not. It does have an internal function - so we are --// declaring it here. This is a hack but has been used by a bunch of others too --// (e.g. Torch). --namespace google { --namespace glog_internal_namespace_ { --bool IsGoogleLoggingInitialized(); --} // namespace glog_internal_namespace_ --} // namespace google -- - namespace c10 { - namespace { - - void initGoogleLogging(char const* name) { - #if !defined(_MSC_VER) - // This trick can only be used on UNIX platforms -- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) -+ if (!::google::IsGoogleLoggingInitialized()) - #endif - { - ::google::InitGoogleLogging(name); diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch b/sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch deleted file mode 100644 index 299c9f88a173..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -112,7 +112,7 @@ - # Note: for now, we will put all export path into one single Caffe2Targets group - # to deal with the cmake deployment need. Inside the Caffe2Targets set, the - # individual libraries like libc10.so and libcaffe2.so are still self-contained. --install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib) -+install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - DESTINATION include - FILES_MATCHING PATTERN "*.h") ---- a/c10/cuda/CMakeLists.txt -+++ b/c10/cuda/CMakeLists.txt -@@ -64,7 +64,7 @@ add_subdirectory(test) - # Note: for now, we will put all export path into one single Caffe2Targets group - # to deal with the cmake deployment need. Inside the Caffe2Targets set, the - # individual libraries like libc10.so and libcaffe2.so are still self-contained. --install(TARGETS c10_cuda EXPORT Caffe2Targets DESTINATION lib) -+install(TARGETS c10_cuda EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - foreach(file ${C10_CUDA_HEADERS}) - get_filename_component( dir ${file} DIRECTORY ) - install( FILES ${file} DESTINATION include/c10/cuda/${dir} ) ---- a/c10/hip/CMakeLists.txt -+++ b/c10/hip/CMakeLists.txt -@@ -55,7 +55,7 @@ target_include_directories( - add_subdirectory(test) - - # ---[ Installation --install(TARGETS c10_hip EXPORT Caffe2Targets DESTINATION lib) -+install(TARGETS c10_hip EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - DESTINATION include - FILES_MATCHING PATTERN "*.h") ---- a/modules/detectron/CMakeLists.txt -+++ b/modules/detectron/CMakeLists.txt -@@ -20,7 +20,7 @@ - if(USE_MKLDNN) - target_link_libraries(caffe2_detectron_ops_gpu PRIVATE caffe2::mkldnn) - endif() -- install(TARGETS caffe2_detectron_ops_gpu DESTINATION lib) -+ install(TARGETS caffe2_detectron_ops_gpu DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(MSVC) - install(FILES $<TARGET_PDB_FILE:caffe2_detectron_ops_gpu> DESTINATION lib OPTIONAL) - endif() -@@ -37,7 +37,7 @@ - target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn) - endif() - target_link_libraries(caffe2_detectron_ops_hip PRIVATE torch) -- install(TARGETS caffe2_detectron_ops_hip DESTINATION lib) -+ install(TARGETS caffe2_detectron_ops_hip DESTINATION ${CMAKE_INSTALL_LIBDIR}) - elseif(NOT IOS_PLATFORM) - add_library(caffe2_detectron_ops SHARED ${Detectron_CPU_SRCS}) - if(HAVE_SOVERSION) -@@ -49,7 +49,7 @@ - if(USE_MKLDNN) - target_link_libraries(caffe2_detectron_ops PRIVATE caffe2::mkldnn) - endif() -- install(TARGETS caffe2_detectron_ops DESTINATION lib) -+ install(TARGETS caffe2_detectron_ops DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(MSVC) - install(FILES $<TARGET_PDB_FILE:caffe2_detectron_ops> DESTINATION lib OPTIONAL) - endif() ---- a/modules/module_test/CMakeLists.txt -+++ b/modules/module_test/CMakeLists.txt -@@ -16,7 +16,7 @@ if(BUILD_TEST AND NOT BUILD_LITE_INTERPRETER) - VERSION ${TORCH_VERSION} SOVERSION ${TORCH_SOVERSION}) - endif() - target_link_libraries(caffe2_module_test_dynamic torch_library) -- install(TARGETS caffe2_module_test_dynamic DESTINATION lib) -+ install(TARGETS caffe2_module_test_dynamic DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(MSVC AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_PDB_FILE:caffe2_module_test_dynamic> DESTINATION lib OPTIONAL) - endif() ---- a/modules/observers/CMakeLists.txt -+++ b/modules/observers/CMakeLists.txt -@@ -21,7 +21,7 @@ endif() - target_link_libraries(caffe2_observers PUBLIC torch_library) - target_include_directories(caffe2_observers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) - target_compile_options(caffe2_observers PRIVATE "-DCAFFE2_BUILD_OBSERVER_LIB") --install(TARGETS caffe2_observers DESTINATION lib) -+install(TARGETS caffe2_observers DESTINATION ${CMAKE_INSTALL_LIBDIR}) - caffe2_interface_library(caffe2_observers caffe2_observers_library) - if(MSVC AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_PDB_FILE:caffe2_observers> DESTINATION lib OPTIONAL) ---- a/modules/rocksdb/CMakeLists.txt -+++ b/modules/rocksdb/CMakeLists.txt -@@ -63,7 +63,7 @@ add_library(caffe2_rocksdb ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb.cc) - target_link_libraries(caffe2_rocksdb PUBLIC torch_library) - target_link_libraries(caffe2_rocksdb PRIVATE ${RocksDB_LIBRARIES}) - target_include_directories(caffe2_rocksdb PRIVATE ${RocksDB_INCLUDE_DIR}) --install(TARGETS caffe2_rocksdb DESTINATION lib) -+install(TARGETS caffe2_rocksdb DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - # ---[ Last, Append the library to Caffe2_MODULES, if we are building with - # the main repo. ---- a/test/cpp/c10d/CMakeLists.txt -+++ b/test/cpp/c10d/CMakeLists.txt -@@ -51,7 +51,7 @@ if(USE_CUDA) - if(INSTALL_TEST) - install(TARGETS ProcessGroupNCCLTest DESTINATION bin) - install(TARGETS ProcessGroupNCCLErrorsTest DESTINATION bin) -- install(TARGETS c10d_cuda_test DESTINATION lib) -+ install(TARGETS c10d_cuda_test DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - endif() - if(USE_UCC AND USE_C10D_UCC) ---- a/test/cpp/jit/CMakeLists.txt -+++ b/test/cpp/jit/CMakeLists.txt -@@ -32,9 +32,9 @@ endif() - target_link_libraries(backend_with_compiler torch) - - if(INSTALL_TEST) -- install(TARGETS torchbind_test DESTINATION lib) -- install(TARGETS jitbackend_test DESTINATION lib) -- install(TARGETS backend_with_compiler DESTINATION lib) -+ install(TARGETS torchbind_test DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS jitbackend_test DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS backend_with_compiler DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - # Build the cpp gtest binary containing the cpp-only tests. diff --git a/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch deleted file mode 100644 index ae0cac9fb947..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/cmake/Dependencies.cmake 2023-02-28 14:14:49.099057348 +0100 -+++ b/cmake/Dependencies.cmake 2023-02-28 14:15:05.326790806 +0100 -@@ -1404,7 +1404,6 @@ - - # Tensorpipe uses cuda_add_library - torch_update_find_cuda_flags() -- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe) - - list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe) - if(USE_CUDA) diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch deleted file mode 100644 index ff64e4108087..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uar pytorch-2.0.0/cmake/Dependencies.cmake pytorch-2.0.0orig/cmake/Dependencies.cmake ---- a/cmake/Dependencies.cmake 2023-04-23 09:43:20.767566047 -0400 -+++ b/cmake/Dependencies.cmake 2023-03-09 17:42:00.000000000 -0500 -@@ -1235,7 +1235,7 @@ - - # ---[ cuDNN - if(USE_CUDNN) -- set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include) -+ set(CUDNN_FRONTEND_INCLUDE_DIR /opt/cuda/include) - target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR}) - endif() - diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch deleted file mode 100644 index acbcebad0a5d..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/c10/util/Registry.h 2023-03-09 17:42:00.000000000 -0500 -+++ b/c10/util/Registry.h 2023-04-09 20:38:33.108135511 -0400 -@@ -16,6 +16,7 @@ - #include <memory> - #include <mutex> - #include <string> -+#include <stdexcept> - #include <unordered_map> - #include <vector> - ---- a/torch/csrc/jit/passes/quantization/quantization_type.h 2023-03-09 17:42:00.000000000 -0500 -+++ b/torch/csrc/jit/passes/quantization/quantization_type.h 2023-04-09 20:43:43.124806308 -0400 -@@ -1,5 +1,6 @@ - #pragma once - #include <ostream> -+#include <cstdint> - - namespace torch { - namespace jit { - ---- a/torch/csrc/jit/runtime/logging.cpp 2023-03-09 17:42:00.000000000 -0500 -+++ b/torch/csrc/jit/runtime/logging.cpp 2023-04-09 20:47:49.758142941 -0400 -@@ -1,6 +1,7 @@ - #include <torch/csrc/jit/runtime/logging.h> - - #include <atomic> -+#include <stdexcept> - #include <mutex> - #include <unordered_map> - - ---- a/torch/csrc/lazy/core/multi_wait.cpp 2023-03-09 17:42:00.000000000 -0500 -+++ b/torch/csrc/lazy/core/multi_wait.cpp 2023-04-09 20:50:36.608145172 -0400 -@@ -1,6 +1,7 @@ - #include <torch/csrc/lazy/core/multi_wait.h> - - #include <chrono> -+#include <stdexcept> - #include <exception> - - namespace torch { diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-fix-openmp-link.patch b/sci-libs/caffe2/files/caffe2-2.1.2-fix-openmp-link.patch deleted file mode 100644 index 3f2d0ae3c30a..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.2-fix-openmp-link.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix "undefined symbol: omp_get_max_active_levels" in mkl + <nothing else> builds -https://github.com/pytorch/pytorch/issues/116576 ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1575,6 +1575,10 @@ if(BUILD_SHARED_LIBS) - target_link_libraries(torch_global_deps TBB::tbb) - endif() - -+ if(USE_OPENMP) -+ target_link_libraries(torch_global_deps OpenMP::OpenMP_CXX) -+ endif() -+ - install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}") - endif() - diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch b/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch deleted file mode 100644 index 731227fa25ee..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -Unset rpath to support blas-lapack-switch -Bug: https://bugs.gentoo.org/921129 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -10,7 +10,6 @@ endif(APPLE) - set(CMAKE_SKIP_BUILD_RPATH FALSE) - # Don't use the install-rpath during the build phase - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) --set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}") - # Automatically add all linked folders that are NOT in the build directory to - # the rpath (per library?) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-rocm-fix-std-cpp17.patch b/sci-libs/caffe2/files/caffe2-2.1.2-rocm-fix-std-cpp17.patch deleted file mode 100644 index cb0fa0c48e80..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.2-rocm-fix-std-cpp17.patch +++ /dev/null @@ -1,68 +0,0 @@ -Fix for error: invalid argument '-std=c++17' not allowed with 'C' -https://github.com/pytorch/pytorch/issues/103222 ---- a/c10/hip/CMakeLists.txt -+++ b/c10/hip/CMakeLists.txt -@@ -30,6 +30,7 @@ hip_add_library(c10_hip ${C10_HIP_SRCS} ${C10_HIP_HEADERS}) - - # Propagate HIP_CXX_FLAGS that were set from Dependencies.cmake - target_compile_options(c10_hip PRIVATE ${HIP_CXX_FLAGS}) -+set_target_properties(c10_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - - # caffe2_hip adds a bunch of dependencies like rocsparse, but c10/hip is supposed to be - # minimal. I'm not sure if we need hip_hcc or not; for now leave it out ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1598,6 +1598,7 @@ if(USE_ROCM) - - # Since PyTorch files contain HIP headers, these flags are required for the necessary definitions to be added. - target_compile_options(torch_hip PUBLIC ${HIP_CXX_FLAGS}) # experiment -+ set_target_properties(torch_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - target_link_libraries(torch_hip PUBLIC c10_hip) - - if(NOT INTERN_BUILD_MOBILE) -@@ -1774,6 +1775,7 @@ if(BUILD_TEST) - target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) - target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) -+ set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>) - if(INSTALL_TEST) - install(TARGETS ${test_name} DESTINATION test) -@@ -1955,6 +1957,7 @@ if(BUILD_PYTHON) - endif() - if(NOT MSVC) - target_compile_options(caffe2_pybind11_state_hip PRIVATE ${HIP_CXX_FLAGS} -fvisibility=hidden) -+ set_target_properties(caffe2_pybind11_state_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - endif() - set_target_properties(caffe2_pybind11_state_hip PROPERTIES PREFIX "") - set_target_properties(caffe2_pybind11_state_hip PROPERTIES SUFFIX ${PY_EXT_SUFFIX}) ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1287,7 +1287,6 @@ if(USE_ROCM) - list(APPEND HIP_CXX_FLAGS -Wno-duplicate-decl-specifier) - list(APPEND HIP_CXX_FLAGS -DCAFFE2_USE_MIOPEN) - list(APPEND HIP_CXX_FLAGS -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_HIP) -- list(APPEND HIP_CXX_FLAGS -std=c++17) - add_definitions(-DROCM_VERSION=${ROCM_VERSION_DEV_INT}) - add_definitions(-DTORCH_HIP_VERSION=${TORCH_HIP_VERSION}) - message("TORCH_HIP_VERSION=${TORCH_HIP_VERSION} is added as a compiler defines") ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -335,6 +335,7 @@ function(caffe2_hip_binary_target target_name_or_src) - caffe2_binary_target(${target_name_or_src}) - - target_compile_options(${__target} PRIVATE ${HIP_CXX_FLAGS}) -+ set_target_properties(${__target} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - target_include_directories(${__target} PRIVATE ${Caffe2_HIP_INCLUDE}) - endfunction() - ---- a/modules/detectron/CMakeLists.txt -+++ b/modules/detectron/CMakeLists.txt -@@ -31,6 +31,7 @@ if(BUILD_CAFFE2_OPS) - ${Detectron_CPU_SRCS} - ${Detectron_HIP_SRCS}) - target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS}) -+ set_target_properties(caffe2_detectron_ops_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - if(USE_MKLDNN) - target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn) - endif() diff --git a/sci-libs/caffe2/files/caffe2-2.2.1-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.2.1-gentoo.patch deleted file mode 100644 index 5472a2c41836..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.2.1-gentoo.patch +++ /dev/null @@ -1,195 +0,0 @@ ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -474,7 +474,7 @@ - endif() - - # ---[ QNNPACK --if(USE_QNNPACK) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - - if(NOT DEFINED QNNPACK_SOURCE_DIR) -@@ -530,7 +530,7 @@ - endif() - - # ---[ Caffe2 Int8 operators (enabled by USE_QNNPACK) depend on gemmlowp and neon2sse headers --if(USE_QNNPACK) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") - include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/neon2sse") -@@ -780,7 +780,7 @@ - endif() - - # ---[ FBGEMM --if(USE_FBGEMM) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - if(NOT DEFINED FBGEMM_SOURCE_DIR) - set(FBGEMM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/fbgemm" CACHE STRING "FBGEMM source directory") -@@ -828,6 +828,7 @@ - endif() - - if(USE_FBGEMM) -+ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) - caffe2_update_option(USE_FBGEMM ON) - else() - caffe2_update_option(USE_FBGEMM OFF) -@@ -1529,7 +1530,6 @@ - set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) - endif() - endif() -- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) - - add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) - if(NOT USE_SYSTEM_ONNX) -@@ -1796,7 +1796,6 @@ - # - set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) --add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) - - # Disable compiler feature checks for `fmt`. - # -@@ -1805,9 +1804,7 @@ - # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know - # `fmt` is compatible with a superset of the compilers that PyTorch is, it - # shouldn't be too bad to just disable the checks. --set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") - --list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) - set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) - - # ---[ Kineto ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -89,7 +89,7 @@ - if(C10_USE_GLOG) - target_link_libraries(c10 PUBLIC glog::glog) - endif() --target_link_libraries(c10 PRIVATE fmt::fmt-header-only) -+target_link_libraries(c10 PRIVATE fmt) - - if(C10_USE_NUMA) - target_include_directories(c10 PRIVATE ${Numa_INCLUDE_DIR}) ---- a/torch/CMakeLists.txt -+++ b/torch/CMakeLists.txt -@@ -59,15 +59,9 @@ - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/aten/src - ${CMAKE_BINARY_DIR}/caffe2/aten/src -- ${CMAKE_BINARY_DIR}/third_party -- ${CMAKE_BINARY_DIR}/third_party/onnx - -- ${TORCH_ROOT}/third_party/valgrind-headers - -- ${TORCH_ROOT}/third_party/gloo -- ${TORCH_ROOT}/third_party/onnx -- ${TORCH_ROOT}/third_party/flatbuffers/include -- ${TORCH_ROOT}/third_party/kineto/libkineto/include -+ /usr/include/kineto - - ${TORCH_SRC_DIR}/csrc - ${TORCH_SRC_DIR}/csrc/api/include -@@ -80,7 +74,6 @@ - python::python - pybind::pybind11 - shm -- fmt::fmt-header-only - ATEN_CPU_FILES_GEN_LIB) - - if(USE_ASAN AND TARGET Sanitizer::address) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -835,12 +835,11 @@ - # Re-include to override append_cxx_flag_if_supported from third_party/FBGEMM - include(cmake/public/utils.cmake) - if(NOT MSVC) -- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") -+ string(APPEND CMAKE_CXX_FLAGS " -O2") - # Eigen fails to build with some versions, so convert this to a warning - # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 - string(APPEND CMAKE_CXX_FLAGS " -Wall") - string(APPEND CMAKE_CXX_FLAGS " -Wextra") -- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) -@@ -930,7 +930,6 @@ - string(APPEND CMAKE_LINKER_FLAGS_DEBUG " -fno-omit-frame-pointer -O0") - append_cxx_flag_if_supported("-fno-math-errno" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-fno-trapping-math" CMAKE_CXX_FLAGS) -- append_cxx_flag_if_supported("-Werror=format" CMAKE_CXX_FLAGS) - else() - # skip unwanted includes from windows.h - add_compile_definitions(WIN32_LEAN_AND_MEAN) ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -486,8 +486,6 @@ - endif() - - # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) -- target_compile_options(${libname} PRIVATE -- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>>:-O2>) - - endfunction() - ---- a/cmake/Codegen.cmake -+++ b/cmake/Codegen.cmake -@@ -57,7 +57,7 @@ - if(MSVC) - set(OPT_FLAG "/fp:strict ") - else(MSVC) -- set(OPT_FLAG "-O3 ") -+ set(OPT_FLAG " ") - if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") - set(OPT_FLAG " ") - endif() ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -107,7 +107,7 @@ - # Note: the folders that are being commented out have not been properly - # addressed yet. - --if(NOT MSVC AND USE_XNNPACK) -+if(FALSE) - if(NOT TARGET fxdiv) - set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") - set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") -@@ -1055,7 +1055,6 @@ - endif() - - if(NOT MSVC AND USE_XNNPACK) -- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) - endif() - - # ========================================================== -@@ -1175,8 +1174,7 @@ - target_include_directories(torch_cpu PRIVATE - ${TORCH_ROOT}/third_party/miniz-2.1.0) - --target_include_directories(torch_cpu PRIVATE -- ${TORCH_ROOT}/third_party/kineto/libkineto/include) -+target_include_directories(torch_cpu PRIVATE /usr/include/kineto) - - if(USE_KINETO) - target_include_directories(torch_cpu PRIVATE ---- a/cmake/External/nnpack.cmake -+++ b/cmake/External/nnpack.cmake -@@ -56,7 +56,7 @@ - set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") - set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") - -- if(NOT TARGET nnpack) -+ if(FALSE) - if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) - set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") - endif() ---- a/functorch/CMakeLists.txt 2023-11-30 20:30:45.805209036 +0100 -+++ b/functorch/CMakeLists.txt 2023-11-30 20:31:13.284766157 +0100 -@@ -35,4 +35,4 @@ - if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") - set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) - endif() --install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") -+install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/sci-libs/caffe2/files/caffe2-2.2.2-musl.patch b/sci-libs/caffe2/files/caffe2-2.2.2-musl.patch deleted file mode 100644 index f63e9f1df332..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.2.2-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/torch/csrc/profiler/unwind/unwind.cpp 2024-04-29 12:05:40.895667482 +0200 -+++ b/torch/csrc/profiler/unwind/unwind.cpp 2024-04-29 12:05:53.099524760 +0200 -@@ -112,8 +112,8 @@ - } - - struct Version { -- uint64_t adds_ = LONG_LONG_MAX; -- uint64_t subs_ = LONG_LONG_MAX; -+ uint64_t adds_ = LLONG_MAX; -+ uint64_t subs_ = LLONG_MAX; - }; - - struct UnwindCache { diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch b/sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch deleted file mode 100644 index eba37d933cac..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2024-04-29 20:32:26.259716769 +0200 -+++ b/CMakeLists.txt 2024-04-29 20:32:35.886384618 +0200 -@@ -50,7 +50,7 @@ - - # This define is needed to preserve behavior given anticpated changes to cccl/thrust - # https://nvidia.github.io/libcudacxx/standard_api/numerics_library/complex.html --string(APPEND CMAKE_CUDA_FLAGS "-DLIBCUDACXX_ENABLE_SIMPLIFIED_COMPLEX_OPERATIONS") -+string(APPEND CMAKE_CUDA_FLAGS " -DLIBCUDACXX_ENABLE_SIMPLIFIED_COMPLEX_OPERATIONS") - - if(LINUX) - include(cmake/CheckAbi.cmake) diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-cudnn_include_fix.patch b/sci-libs/caffe2/files/caffe2-2.3.0-cudnn_include_fix.patch deleted file mode 100644 index 77905dbd1ac8..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.3.0-cudnn_include_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/Dependencies.cmake 2024-04-29 18:37:34.005639858 +0200 -+++ b/cmake/Dependencies.cmake 2024-04-29 18:39:29.126587738 +0200 -@@ -1235,7 +1235,7 @@ - if(CUDNN_VERSION VERSION_LESS 8.5) - message(FATAL_ERROR "PyTorch needs CuDNN-8.5 or above, but found ${CUDNN_VERSION}. Builds are still possible with `USE_CUDNN=0`") - endif() -- set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include) -+ set(CUDNN_FRONTEND_INCLUDE_DIR /opt/cuda/include) - target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR}) - endif() - diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-rocm-fix-std-cpp17.patch b/sci-libs/caffe2/files/caffe2-2.3.0-rocm-fix-std-cpp17.patch deleted file mode 100644 index 127a31e4b225..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.3.0-rocm-fix-std-cpp17.patch +++ /dev/null @@ -1,68 +0,0 @@ -Fix for error: invalid argument '-std=c++17' not allowed with 'C' -https://github.com/pytorch/pytorch/issues/103222 ---- a/c10/hip/CMakeLists.txt -+++ b/c10/hip/CMakeLists.txt -@@ -30,6 +30,7 @@ hip_add_library(c10_hip ${C10_HIP_SRCS} ${C10_HIP_HEADERS}) - - # Propagate HIP_CXX_FLAGS that were set from Dependencies.cmake - target_compile_options(c10_hip PRIVATE ${HIP_CXX_FLAGS}) -+set_target_properties(c10_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - - # caffe2_hip adds a bunch of dependencies like rocsparse, but c10/hip is supposed to be - # minimal. I'm not sure if we need hip_hcc or not; for now leave it out ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1712,6 +1712,7 @@ if(USE_ROCM) - - # Since PyTorch files contain HIP headers, these flags are required for the necessary definitions to be added. - target_compile_options(torch_hip PUBLIC ${HIP_CXX_FLAGS}) # experiment -+ set_target_properties(torch_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - target_link_libraries(torch_hip PUBLIC c10_hip) - - if(NOT INTERN_BUILD_MOBILE) -@@ -1908,6 +1909,7 @@ if(BUILD_TEST) - target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) - target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) -+ set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>) - if(INSTALL_TEST) - install(TARGETS ${test_name} DESTINATION test) -@@ -2092,6 +2094,7 @@ if(BUILD_PYTHON) - endif() - if(NOT MSVC) - target_compile_options(caffe2_pybind11_state_hip PRIVATE ${HIP_CXX_FLAGS} -fvisibility=hidden) -+ set_target_properties(caffe2_pybind11_state_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - endif() - set_target_properties(caffe2_pybind11_state_hip PROPERTIES PREFIX "") - set_target_properties(caffe2_pybind11_state_hip PROPERTIES SUFFIX ${PY_EXT_SUFFIX}) ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1278,7 +1278,6 @@ - list(APPEND HIP_CXX_FLAGS -Wno-duplicate-decl-specifier) - list(APPEND HIP_CXX_FLAGS -DCAFFE2_USE_MIOPEN) - list(APPEND HIP_CXX_FLAGS -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_HIP) -- list(APPEND HIP_CXX_FLAGS -std=c++17) - if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "6.0.0") - list(APPEND HIP_CXX_FLAGS -DHIPBLAS_V2) - endif() ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -335,6 +335,7 @@ function(caffe2_hip_binary_target target_name_or_src) - caffe2_binary_target(${target_name_or_src}) - - target_compile_options(${__target} PRIVATE ${HIP_CXX_FLAGS}) -+ set_target_properties(${__target} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - target_include_directories(${__target} PRIVATE ${Caffe2_HIP_INCLUDE}) - endfunction() - ---- a/modules/detectron/CMakeLists.txt -+++ b/modules/detectron/CMakeLists.txt -@@ -31,6 +31,7 @@ if(BUILD_CAFFE2_OPS) - ${Detectron_CPU_SRCS} - ${Detectron_HIP_SRCS}) - target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS}) -+ set_target_properties(caffe2_detectron_ops_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) - if(USE_MKLDNN) - target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn) - endif() diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 0e7256bfcebc..b9f812da1de9 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,5 +1,7 @@ AUX cantera-3.0.0_enable_python-3.12.patch 3182 BLAKE2B 30d2af004ee4d5097bf114fc1f8cd8e5589c9a0d643d87da544a9de0d824df1c04f461f89415dfc6b27c385e520c9b8f53ce82fcc7c4ca5dbb59f03a4a443544 SHA512 65261a618d93f0f84a3ba9a2aad8cccfee8490c78a44acddc4cc7c8ff3065bbde2370b6fcf06e8c1091efa9f244553a3810d362553194699104b19fed8647aea AUX cantera-3.0.0_env.patch 1439 BLAKE2B 8f4cd901f24f0b526887501ba16a0552acf8572f154f8494d66d3dd8096434621d6f2baaa57f905233919fc1b7872993bada9f373950330663c8315075d507b9 SHA512 065cdbcf620a3036c1bb0bb8b79503f76dbe7e6b2522e9f53fc582c15e5e10f1790f1b40cf0315d64cab4f858764446f4094370124bb9b5c4ee6dbcfd5e61b87 DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca -EBUILD cantera-3.0.0-r1.ebuild 3332 BLAKE2B 456bc6bf09d46deec64badef49a6e500cba362dc4c7d17eb2b18cd9a2e091ff4ee3a557ca8f250dbe4a4060207537484bdadb59ec550655cd2546b894762f959 SHA512 56d41d45c946a6b90c53aefa214a97ca3983106a25225088bc5d0a813eff4ae102e3b983cd2f89dcc3ee494c8f1fdd8e96f38e8b90d441522042d5ad5ffe60b1 +DIST cantera-3.0.1.tar.gz 2451841 BLAKE2B b05771021a81d5266dfed382e2a6357e5b70653c6d9cfb5f03a6755095f4f8f4e7c0f78b79e0bf131c01fefce46bbc647c790ee412b6457c515cda39d4fc3054 SHA512 fa993b33867c6c0a0ca539f52116c4cdea739dfcd30deb5d2f66042f290f7f2f60112d7a37c38fbd8a38a119e5af00a7a85fd80b6e36388202b666be0ddd7715 +EBUILD cantera-3.0.0-r1.ebuild 3450 BLAKE2B 60c406b5ed46e5d42373711fe0fe33e8e8afcecf480b76dea6084bd14c9b776994752e3d7ba643558b89da35f537e7863d919395038b6a9b7ec215ea0129a1f4 SHA512 0e3c295bbf671195b607d08f19227a6b6e9e161c25dcd297b09bf6f199f61b20a743b7fd6880680671a8062c7e592aaf4b54152d1012f09e1867edc9be6fcf56 +EBUILD cantera-3.0.1.ebuild 3413 BLAKE2B 486467d4d5215afc2202d9e2a9d1bcd01cf7cf36f13ddd0916d6914db938e659352b2ccf6ca928dee82c4ae5cc02462205a7d7f6a83255704b0b245757d1ec81 SHA512 4395d407158dfd893168a62dbbeb1c9e9cc85ae4f3efdda7f58f0cd5e9eee6715d920a38640a6d77df2c37e4171003b429999ea28f83cc57fe7ac21d7f3377d6 MISC metadata.xml 884 BLAKE2B 0f67510f6c09c58b0af3b820c9b38b88b0c60b0adb28c64148550f07df085cd8ea3d46f5afb59105c56bb7ccf2ca3fee4f2000bee2592ebafb835b9cf415b660 SHA512 0cdbc4cbd0dfdc90bb74c79f06d5f5d28a4edd0dcfacbddcc83ed804c592694eba27f337ce20a2a57248dd0456517bab2298faa22b78154f03e9369973fc174b diff --git a/sci-libs/cantera/cantera-3.0.0-r1.ebuild b/sci-libs/cantera/cantera-3.0.0-r1.ebuild index 9f0de3263452..c6b3ec2711e1 100644 --- a/sci-libs/cantera/cantera-3.0.0-r1.ebuild +++ b/sci-libs/cantera/cantera-3.0.0-r1.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} ) FORTRAN_NEEDED=fortran FORTRAN_STANDARD="77 90" -inherit fortran-2 python-single-r1 scons-utils toolchain-funcs +inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" HOMEPAGE="https://www.cantera.org" @@ -78,6 +78,10 @@ pkg_setup() { ## Full list of configuration options of Cantera is presented here: ## http://cantera.org/docs/sphinx/html/compiling/config-options.html src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://github.com/Cantera/cantera/issues/1783 + filter-lto + scons_vars=( AR="$(tc-getAR)" CC="$(tc-getCC)" diff --git a/sci-libs/cantera/cantera-3.0.1.ebuild b/sci-libs/cantera/cantera-3.0.1.ebuild new file mode 100644 index 000000000000..46a9c3b2f469 --- /dev/null +++ b/sci-libs/cantera/cantera-3.0.1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD="77 90" + +inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs + +DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" +HOMEPAGE="https://www.cantera.org" +SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="fortran hdf5 lapack +python test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/yaml-cpp + hdf5? ( sci-libs/HighFive ) + !lapack? ( sci-libs/sundials:0= ) + lapack? ( + >=sci-libs/sundials-6.5.0:0=[lapack?] + virtual/lapack + ) + python? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + ') + ) +" + +DEPEND=" + ${RDEPEND} + dev-cpp/eigen:3 + dev-libs/boost:= + dev-libs/libfmt + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + ) + test? ( + >=dev-cpp/gtest-1.11.0 + python? ( + $(python_gen_cond_dep ' + dev-python/h5py[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + ') + ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.0.0_env.patch" +) + +pkg_setup() { + fortran-2_pkg_setup + python-single-r1_pkg_setup +} + +## Full list of configuration options of Cantera is presented here: +## http://cantera.org/docs/sphinx/html/compiling/config-options.html +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://github.com/Cantera/cantera/issues/1783 + filter-lto + + scons_vars=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + cc_flags="${CXXFLAGS}" + cxx_flags="-std=c++17" + debug="no" + FORTRAN="$(tc-getFC)" + FORTRANFLAGS="${FCFLAGS}" + optimize_flags="-Wno-inline" + renamed_shared_libraries="no" + use_pch="no" + ## In some cases other order can break the detection of right location of Boost: ## + system_fmt="y" + system_sundials="y" + system_eigen="y" + system_yamlcpp="y" + hdf_support=$(usex hdf5 y n) + system_blas_lapack=$(usex lapack y n) + env_vars="all" + extra_inc_dirs="/usr/include/eigen3" + use_rpath_linkage="yes" + extra_lib_dirs="/usr/$(get_libdir)/${PN}" + ) + use hdf5 && scons_vars+=( system_highfive="y" ) + use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) + use test || scons_vars+=( googletest="none" ) + + scons_targets=( + f90_interface=$(usex fortran y n) + ) + + if use python ; then + scons_targets+=( python_package="full" python_cmd="${EPYTHON}" ) + else + scons_targets+=( python_package="none" ) + fi +} + +src_compile() { + escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr" +} + +src_test() { + escons test +} + +src_install() { + escons install stage_dir="${D}" libdirname="$(get_libdir)" + if ! use python ; then + rm -r "${D}/usr/share/man" || die "Can't remove man files." + else + # Run the byte-compile of modules + python_optimize "${D}$(python_get_sitedir)/${PN}" + fi + + # User could remove this line if require static libs for development purpose + find "${ED}" -name '*.a' -delete || die +} + +pkg_postinst() { + local post_msg=$(usex fortran "and Fortran " "") + elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory." +} diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest index 1b47783b15ef..f6de40e133c4 100644 --- a/sci-libs/cdf/Manifest +++ b/sci-libs/cdf/Manifest @@ -1,15 +1,5 @@ AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc -AUX cdf-3.8.0-respect-flags.patch 3080 BLAKE2B 1a89fef44861e1954d42fa68f8dc9398299656eaa08686ea07577e329c70f28ea5967079a94819c8f8b4d99369ec8041fa37443a9be0d3e580fe396dacb1b3fd SHA512 7d6dd822f81a2d80b73cc55b76b46c0016ab1dc4c754a90b57c2d2c99912c045853cf132d7c26dbfe804fc4cc908647ad7832b3048edfe5b2b4e735b23499953 AUX cdf-3.9.0-respect-flags.patch 2704 BLAKE2B befb5b5bdfe01334ccce346f15fa079505a4c544f38cad26ea36e8e18db2ed55a08602d2a4798be1ac2feaa6fa3806aac590e4f2f551736371bff8973957565c SHA512 d51dea20c4f708aa3a4d77147cef50c8d1e572088ffa2e8a9323d3b31915a77760a0dd3e04d161b29859b734424ad34616277ad8fdf032ce1a50d843058c20c2 -DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081 -DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163 -DIST cdf380frm.pdf 2570409 BLAKE2B c8fb1444c7e02297af0c3bffbf58c048077e0d69c4aca8cb3e48331f496dba1551289d2e2b95f9f2d9fabe8048bd56f73a72bab58a52772cae22f184a6b39745 SHA512 de90e4893b976ab9e77f1e9512b2f310b043b8dc921ca43cf1d37e767bf5cbae5d06f91388ff5f4fb1258db5a1149712fa9a5dbc1c2d18f78705021fc31087bb -DIST cdf380prm.pdf 1521804 BLAKE2B 4afa792f3b5f2bda7e896e10ccb6b2b073e127fca9ece229bb3dbe3b8e8920ef5b8cce5a45a15fa648525c8241fbcc678c8eea0a32a3dabad4cd3b9e959e0913 SHA512 413ce06f36d151cc5380884111376fb54108fcf692ac56ed4d96204f56d4d434ca695d42114e1e89626288802cb4d5d48097664e8e0411a041950aff8199fea0 -DIST cdf380ug.pdf 1716882 BLAKE2B e36f0a9624756d6d5bf71fcc0958d33d060b7f32dd7bbb93fcf6a58a33a5154017fd0ba8a598fe652919785398d306e84fe7a89b5c4aa0d305ee0bc2fbf20b8f SHA512 f2e865b55d293a17a5d85c36e04d14050b7f17adc97dfc284d95db36ae1b94678e31b107cbab32ad690630bbde0f3f0caf558ecdb4e1d0e60cd5f53b30faa0fc -DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a787bcdb9d179d334f4cb79f2b5c6d98427ab9a6451b44e333f48932c152674ce7c9229291b3b714e0f70 SHA512 8552d1f1a83a0f327bc20e8dc03f8728aad132e5765084839ee02900d19c93f9c7f67a1e3f4429cc01d51d75ab00b666d18a247522da2b4fda529cf6333889b5 -DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce -DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be -DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c DIST cdf390crm.pdf 2029732 BLAKE2B 011652b3c55910dea6c4e7b47e003335826e3471bfab41e27a1baf44397b4efd684f75b8e09018279cf9ee53f3d3de65a8c5905769e04aa93b893bbc470117a8 SHA512 b1b60c0b77bece7f0f722505bff1abba1798a220627216f04c84163a3efb51fdd31bc3abe2f8dacd0bb31e6aee585301939d38dc9353fda0535475ba973593be DIST cdf390csrm.pdf 1865382 BLAKE2B 83bc066468867b946e3962f1c4b2717f218ea2b92100b43ff18457c1759e2bd71028919aa6403030b840aaa5709a0fafa3e5e6a8843df52e44b3ff335e44dff0 SHA512 f614e1cea672c69eb08e0559e6d1b743f1eaf4f20c1e9dda8ca372ece3040676ba312b5800640b6f202aa9cc45b90e3ce9fbf07fcf621ed8591cbcbfc4e42a24 DIST cdf390frm.pdf 1896169 BLAKE2B 26cafadaaaf861a4556d54c2fcd09f74c763a8d56e170a75b1247ac700c4082b1d09c446568e814b8b126b5ca2c4d1d0c3cc658ceb49fa6823fcbfe6db7326b2 SHA512 a696a1a774d31f1b023e15d9d510baa7407ea0f6a76bd065bb7c69bb85a3ea5aff6999949a6ed8ce21c418928eca6d90d22e0439ab959f3c1d2b7b9f0a33878e @@ -19,6 +9,5 @@ DIST cdf390vbrm.pdf 1729074 BLAKE2B d30d177202b516891dba0cb99113d6d19af41d950384 DIST cdf39_0-dist-cdf.tar.gz 1290187 BLAKE2B 03f7c7840c44514046df0d63ff6086be7263858f90225debfb8a4fe6c4d6e5b03c95faa2762f76e2ffc198ac77359b3494520258ec17678746fd7f619e362853 SHA512 e054b763d86c09c53375ef60a8690f43fcb106be1dc6fd907763379db1ab4c9677692671a63da74d955aec8ce3f866f420ddc7217a59ed68e51c4623562af387 DIST cdf39_0-dist-java.tar.gz 1162924 BLAKE2B 4e6416ec5a2a2eede428fa00906ca0e42460916506e7b2075d622e322ffe53e337a77bf81aa871e1559fb6b9339f2f49e365ca835874e060da33cd7c68e45177 SHA512 860468257c70bd6cb9592f40e495b5efb9092fc6fa3ab68c2fdc729c46d9ea4f0499a0b29904fe9c1ae07c13958e551b4e5cc8b9b71c2401ca833f2020073606 DIST cdf39ifd.pdf 656522 BLAKE2B 2ec3831f27e92fcec8191bedb1617c9f590b726732e02dd8ca317b814c369b46d50dd19e7bfc81df233e1e32ca6fb8191bf7e075ce67dda1ddd50645d5fc754b SHA512 f4de5bea46b7d1ea2621b9fa0ac1ab0f9904ada9a1625ce613f6fdb68ad25ca52398cbf75bb27902e54ba5ee7820f3ea1a563c655186047b8954cb53b4cd8197 -EBUILD cdf-3.8.0-r1.ebuild 3370 BLAKE2B 228ec6a849cae4a6a62fdb595e6746cb2c75ccc6bee68f0446afc3ab53180dc6bcdaa726523e9cbb8518cbedf961433f9d3eb8753b2c6b26a7ff625b16c68436 SHA512 a1cbb2e8f50281ba4155b03d5b802823210229e7d00a184d0f1fb5bc055133d9e4c5ee2cdb2da191ca4bc076dbbbd7f224e26f84616f070fd33cc70d23bff16d -EBUILD cdf-3.9.0.ebuild 3635 BLAKE2B bd77f0d52b94bc14b866fcfe92a33cd16e38db6ee4411628235d7f54588a39f15aed3bc378a58faceebeb36f03ae7c41ee091efdc06bdb06e2e5b36b44ef9124 SHA512 d7ffd82cbc1d75d049f4ee61615a2f346348268d4ec4768e98414eae0e6d1e330a079a4b5794017b49b7fdbd7a49e5f6bac2d4c8bfba565a3a45a164911324e5 +EBUILD cdf-3.9.0.ebuild 3634 BLAKE2B f590834974d3f8b37b47ca030c0d15316afff4b2a54818ca146a2e6bdd56fe1c54ec660a969b12e01f941c83a480953c1f0b5b75da38d52c253e677f0b449b46 SHA512 2d4eb742c28a1bf825b1dca32935554caa08dea4bc0aec8988a83b3f3247e0c9f4512ea1066dfe89932215511999101b1b9692b61a969e45a4b6c94ece281f3e MISC metadata.xml 1050 BLAKE2B fb46e44a9381f11bbb49a6d0429b7906026f68812064c2f6bf57d1445ed98c640659563cd323e5a6d22897a0a07af3ab60e23082d080111094ba607c97049e8b SHA512 e4e6c6a12b6fb7f12c165726c8238276e14b5873b6d476ae84935e6ba5c903b4214190ad778918d538825ff04280c174e2629e8e5b8424413085431eb7d449d0 diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild deleted file mode 100644 index 7a705868953c..000000000000 --- a/sci-libs/cdf/cdf-3.8.0-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic java-pkg-opt-2 multilib toolchain-funcs - -MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)" -MY_P="${MY_DP}_$(ver_cut 3)" - -DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets" -HOMEPAGE="https://cdf.gsfc.nasa.gov" -SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/" - -SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz - java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz ) - doc? ( - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf - ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf - )" - -LICENSE="CDF" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples java ncurses static-libs" -RESTRICT="bindist" - -RDEPEND=" - java? ( >=virtual/jre-1.8:= ) - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND=" - ${RDEPEND} - ncurses? ( virtual/pkgconfig ) -" - -S="${WORKDIR}/${MY_P}-dist" - -# respect cflags, ldflags, soname -PATCHES=( - "${FILESDIR}"/${P}-respect-flags.patch -) - -src_prepare() { - default - - # use proper lib dir - sed -i \ - -e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \ - Makefile || die "sed failed" -} - -src_compile() { - # Reported upstream by email in 2024-03-22 (bug #862675) - append-flags -fno-strict-aliasing - filter-lto - - PV_SO=${PV:0:1} - emake \ - OS=linux \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - ENV=gnu \ - SHARED=yes \ - SHAREDEXT_linux=so.${PV_SO} \ - CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \ - CURSES=$(usex ncurses) \ - ${myconf} \ - all - - if use java; then - export CDF_BASE="${S}" - export CDF_LIB="${S}/src/lib" - cd cdfjava/jni - $(tc-getCC) \ - ${CFLAGS} -fPIC \ - -I${CDF_BASE}/src/include \ - -I$(java-config -O)/include \ - -I$(java-config -O)/include/linux \ - -c cdfNativeLibrary.c \ - -o cdfNativeLibrary.o \ - || die "compiling java lib failed" - $(tc-getCC) \ - ${LDFLAGS} \ - -shared cdfNativeLibrary.o \ - -Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \ - -L${CDF_LIB} -lcdf -lm \ - -o libcdfNativeLibrary.so.${PV_SO} \ - || die "linking java lib failed" - fi -} - -src_test() { - emake -j1 test -} - -src_install() { - dodir /usr/bin /usr/$(get_libdir) - # -j1 (fragile non-autotooled make) - emake -j1 \ - INSTALLDIR="${ED}/usr" \ - SHAREDEXT=so.${PV_SO} \ - install - dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so - use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a - dodoc Release.notes CHANGES.txt Welcome.txt - doenvd "${FILESDIR}"/50cdf - - if use doc; then - dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf - fi - - if use examples; then - docinto examples - dodoc samples/* - fi - - if use java; then - cd cdfjava || die - dolib.so jni/libcdfNativeLibrary.so.${PV_SO} - dosym libcdfNativeLibrary.so.${PV_SO} \ - /usr/$(get_libdir)/libcdfNativeLibrary.so - java-pkg_dojar */*.jar - if use examples; then - docinto examples/java - dodoc examples/* - fi - fi - - # move this to a better location - dodir "/usr/share/${PF}" - mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die -} diff --git a/sci-libs/cdf/cdf-3.9.0.ebuild b/sci-libs/cdf/cdf-3.9.0.ebuild index 041ee9765e53..9c0cc7667b48 100644 --- a/sci-libs/cdf/cdf-3.9.0.ebuild +++ b/sci-libs/cdf/cdf-3.9.0.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}-dist" LICENSE="CDF" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples java ncurses static-libs" RESTRICT="bindist" diff --git a/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch b/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch deleted file mode 100644 index 8ffd226a1ed1..000000000000 --- a/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/Makefile b/Makefile -index 9857fa9..6dc0953 100644 ---- a/Makefile -+++ b/Makefile -@@ -896,7 +896,7 @@ install.tools: create.bin copy.tools - install.help_: create.help copy.help - - install.lib: create.lib copy.lib.a -- @if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \ -+ @if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \ - $(MAKE) MAKE=$(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \ - else \ - $(NULL) ; \ -@@ -1010,10 +1010,10 @@ copy.include: - cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include - - copy.lib.so: -- @echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib -- cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.$(VERSION).so -- rm -f $(INSTALLDIR)/lib/libcdf.so -- cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.so -+ @echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib -+ cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib/libcdf.$(VERSION).so -+ rm -f $(INSTALLDIR)/lib/libcdf.$(SHAREDEXT) -+ cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.$(SHAREDEXT) - - copy.lib.sl: - @echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib -diff --git a/src/lib/Makefile b/src/lib/Makefile -index 2017c46..b666ce3 100644 ---- a/src/lib/Makefile -+++ b/src/lib/Makefile -@@ -62,9 +62,9 @@ AR=ar - RANLIBcmd=ranlib - MACos=Darwin - --CFLAGS=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR) -+CFLAGS+=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR) - CFLAGS2=-DZ_PREFIX --LDFLAGS=$(LDOPTIONS) -+LDFLAGS+=$(LDOPTIONS) - ARFLAGS=$(AROPTIONS) - ZLIB=zlib - -@@ -120,13 +120,13 @@ ranlib.yes: - - shared.yes: libcdf.$(SHAREDEXT) - --libcdf.so \ -+libcdf.$(SHAREDEXT) \ - libcdf.dylib \ - libcdf.dll \ - libcdf.sl: $(OBJs) - @if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi -- @echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -- $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -+ @echo $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS) - # @if [ $(MACVERSION) -gt 0 ]; then \ - # rm -f $(MACLIB)/$@; \ - # cp $@ $(MACLIB)/libcdf.$(VERSION).dylib; \ -@@ -134,8 +134,8 @@ libcdf.sl: $(OBJs) - # fi - - libcdf.o: $(OBJs) -- @echo $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -- $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -+ @echo $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) - - .c.o: - @if [ "$<" = "cdfgzip.c" ] || [ "$<" = "cdfgzip64.c" ] ; then \ -diff --git a/src/tools/Makefile b/src/tools/Makefile -index bac4ca0..ef44264 100644 ---- a/src/tools/Makefile -+++ b/src/tools/Makefile -@@ -33,7 +33,7 @@ - SHELL=/bin/sh - - CURSES=yes --CCx=gcc -+CCx=$(CC) - COPTIONS=-I/usr/include/ncurses -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -O2 - COPTIONSld= - SYSLIBS=-lgcc -@@ -43,8 +43,8 @@ MAKE=make - INCLUDEcdf= ../include - - CC=$(CCx) --CFLAGS=$(COPTIONS) -I$(INCLUDEcdf) --CFLAGSld=$(COPTIONSld) -+CFLAGS+=$(COPTIONS) -I$(INCLUDEcdf) -+CFLAGSld=$(COPTIONSld) $(LDFLAGS) - - WHICHOS=$(shell uname -a | cut -f1 -d" ") - ifeq ("$(WHICHOS)","Darwin") diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest index a69811b7737c..877ebe56a12b 100644 --- a/sci-libs/ceres-solver/Manifest +++ b/sci-libs/ceres-solver/Manifest @@ -1,6 +1,7 @@ AUX ceres-solver-2.0.0-system-mathjax.patch 325 BLAKE2B a649088517ec1bef7d5a6144de57657daeff2b5a1a0b053c0bfa81d8af7143ad5d829571be947d8853bd6d1fe39adc63b4f14a4075004775151fa649747911c6 SHA512 e16646210fddb350f5cc43665afaa88d2ffe53c817dab778c0e2534c1a0001242865a547e8a308621a9068555e7e20a57e83b0447ff5d32688ed5fb3f5694d29 +AUX ceres-solver-2.2.0-include-algorithm.patch 434 BLAKE2B 8db5a4f0a439b182e2c8d9f5aed9a610e6b83d81cb4a1169f307f2ee7a171c3ea12b1d73254278ff9131604c0070ba5b73bbdcf30b2059dda58c87a16f078378 SHA512 d2e9e34ab4d6d586fb8cb7b865fbb05af778685d776fa24badaa2d46547db63025efaf67a25d9197b88a2afa053bf45fe1526a2013764bf1bef8107f4cdd48e5 DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633 SHA512 db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2 DIST ceres-solver-2.2.0.tar.gz 7635532 BLAKE2B ecdd5147e235df711705fc262fad18cfc79f8cfaaa9aba41428c70ae5996aab44c44e5b7d3f62d8ab4633ec2d7511c39191323911fea1276f5797e900c42bc60 SHA512 bf519fbcbd0ee2d4624be72cde061a09d191ee5e56dc33984669393799b885c2164efc99dcef71307f8b50a9ccad945882376ace3d9a44ba7e1f25c20511aabd EBUILD ceres-solver-2.1.0-r1.ebuild 2426 BLAKE2B 05047be09beed316cc5d288923a31553f9ee3c4afb01b83265b67be04d84dd9104b3c444f867a1a9b632ef6fb013e4556897f7bc0da7dbdc9ccefe647a994689 SHA512 c46f722f17201355c791fea3e3229c2fd8fa74432205635abd68d20544039f879196ebec6ffda10b40a9138a4c9e507724de2e7bd48d2a7e07cf12629bb88869 -EBUILD ceres-solver-2.2.0-r1.ebuild 2346 BLAKE2B a29364932d0f82653555823ab18063bef21c418aba7501439abc19edb01e6474edd23c5a99712d14ddc581a4b31aff4549abb7fa2b1e3cbec0f25b2bd3c5844d SHA512 3e1483b0e695c467a3846f0973b2f470964bd99b5293a977bd62f6943769adfb3b554784d3e9e5ef5d925a8430fdddd08a140f2235135d86d2256437b673de11 +EBUILD ceres-solver-2.2.0-r1.ebuild 2397 BLAKE2B ea6780a8bd2039d437f96269e12b8a8ab85abcedf086d41c8188292dcdf9ad6f9c3b4e2437129d22c93fe5dfc5c23e506ea2f612cb656dbbc3769a16fe183962 SHA512 b78fc602969047576feab69b67592e18018858793a16acc72678dde621fd155934fef82c1119a0069d5ded220ec19302087d1bfbc614d7319bf8533063313730 MISC metadata.xml 1454 BLAKE2B af5a9cef52650cff056c7804782e7024696ed9122e8998faad23796960d94155f5f318cec2750a4ead6610f89fe55e49301a30ec62bfc846ea2a955a430f42cf SHA512 cf928d9400bbac7ba003ad44fc6c1d77cef43a58d2cc9b399ee854880ad75b38062e3a61899403eda529e7eaba528606a8da25b5e287c53bc4721d025b6a7e59 diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild index eb2f320fe9bc..191c4845525f 100644 --- a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild +++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild @@ -45,6 +45,7 @@ DOCS=( README.md VERSION ) PATCHES=( "${FILESDIR}/${PN}-2.0.0-system-mathjax.patch" + "${FILESDIR}/${PN}-2.2.0-include-algorithm.patch" ) src_prepare() { diff --git a/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch b/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch new file mode 100644 index 000000000000..4f5887eec6e4 --- /dev/null +++ b/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch @@ -0,0 +1,18 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Wed, 21 Aug 2024 20:19:25 +0200 +Subject: [PATCH] include algorithm + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +--- a/internal/ceres/cuda_streamed_buffer.h ++++ b/internal/ceres/cuda_streamed_buffer.h +@@ -34,6 +34,9 @@ + #include "ceres/internal/config.h" + + #ifndef CERES_NO_CUDA ++ ++#include <algorithm> ++ + #include "ceres/cuda_buffer.h" + + namespace ceres::internal { diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index c07d3ee342fa..69d7f53c7c09 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,10 +1,3 @@ -AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f9e95913b26741199c0db68ef8e69bd3efb901bf938d6bf2529d9359d3e97bd9823e6c871b8873aa368aebf097faa SHA512 8a78b2ba84bb5fc904c7e642410945674b9bee20fe36e46b1e7c0b4f369ef934cd75ded3f9fb9dcf465f11ae30d1e2fbfa5c0e70adf3c8264b96bca5238e31a2 -AUX cfitsio-4.2.0-pkgconfig.patch 685 BLAKE2B a231cbaa3df98088248cf9064c00bab5c76398a88c4494c7e827e325627e6c3f74b1228bda1bc4cba1fd7a32916121095ee0a07c8a7fa18adfdf85815717ddb0 SHA512 7ce6e934d19cb08bac4002edcad2310e45d073abfece87db8b654b5d4b52930f382f5ef3713412311bf5bb32361a27cb9ee8ccdd012fb23ca3b2bcae9ea8a028 -AUX cfitsio-4.2.0-system-zlib.patch 2589 BLAKE2B 6dbba94f0a3779d18f92478c82a4ff19c6b1bcef7ce72b9a33623b483de8dc99f771f1e1d5868f87b4dd605de94eb3e6ffef53163a88f9300bd9e5a32ba5a2c0 SHA512 a27692620d0c21641d2e4e739c735daac78af200cf8002dd3cf411a7fc14189faca3e5988f00aca1028d06badd4a76353f27b56d40ea9966cb4c9be183f9176d -DIST cfitsio-4.2.0.tar.gz 4356372 BLAKE2B 7f5e695a56105866b2457e0f1c2d74bfb2aa86bc53e4eeb39aa9b8e79b278e1184a610422bf43c341a9f3159a93b980bab1ec9084475189b08dfa080b59ec2af SHA512 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853 -DIST cfitsio-4.4.0.tar.gz 4278372 BLAKE2B 883a88b08ecddb756a479c361fd0dc4741cffd9b82f311d3cde3f4bede2ac3cb68c8597a5d1cc1350f14b2b145a628fa0ec90754284c0cd4ec1472cb370af01e SHA512 9358b1ed94fdc456cf8c0ddcb346c08f6bc97ee862c31366f3fae2d1be8d5278ffc79da01e41ceebf67ebc831f58bce3551e087c883bbf6b396133110d74b076 DIST cfitsio-4.4.1.tar.gz 4308170 BLAKE2B 237a2f899b39a01ed73e3e41b420874c7654faf1f93e3c3b3454d2001a472f64b1c44fa2c88598ea21e3a8d60a1dcb76aa3001fee1e4443f91bcd565ce605a4f SHA512 a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7 -EBUILD cfitsio-4.2.0.ebuild 1877 BLAKE2B 3b541f0d4930b42d8ece6acdaa1be4e7c1443f84800b7642ff6dbb9f15125122f7ede4c07034e508d80fce187797faaac4ca370a19ecc99cc91cd37a15e6a485 SHA512 f5694ab2d6666d622427055987d635ec7063ddba754332cc0527a0aaacd6dda0359554ec13d08760f73508e9606fd517d93a571686748bf518cedcbfbb553ba5 -EBUILD cfitsio-4.4.0.ebuild 1836 BLAKE2B 0ec49e9cc08b6179ee846e227b210d3d776fa2f2c551c6ca6658ac43ed503c6afcf8234916da4a51cb92cf1d5221959ad2b132159408049f5e262757b58afe05 SHA512 6bc6c8f1248271cf5754b9354bb8d76a2776fd963aac033c477b8a7be6c900d072f00117091eb9f55a8d7c52ef28500602adb65165d4818d026f7615e8f991f1 -EBUILD cfitsio-4.4.1.ebuild 1834 BLAKE2B a2b7edef58c55d580bda02eeacfbf1b6fcaf5ea40009c55d11531bf8271b34718f31692c2f80360699868a4ca5b55ed693f58eaaf5a2b5b9ef8366e90e3cd0f9 SHA512 0080082da08eb178ad80b5cdf45d5b3f6b1b76d82ed8dc9136b5d663c34427a3dffcbb2f84ec69a42f720a9c9970774a258604a0c893b7dcc1a75d2d1f367b11 +EBUILD cfitsio-4.4.1.ebuild 1833 BLAKE2B defdf2cbdede916f77d0851ef686eb5756896a5caef1c383260624b9c00f3a01f6a7ca25c2d9000fe062c281150c59bd9407fa17d0f25f8c8337a4b57124ab82 SHA512 59c4adef378d805734499999e82b2e9db022e159b6bdf2f1d4e86997cd62fa8fee842bafc3bb0d7deeef6fd3b91f606118b80f94457159226056e2fe82ab41d5 MISC metadata.xml 1032 BLAKE2B 4479a1c6a42796e7effcc1b53ecc30d11e7302140cee2a34f7deaa1270497d0b0add85ddf1ce38223b357a9cac5f11af9039246f41228aca7d73653fd58a0fcf SHA512 ad32ecfbeceae8d768e9fa63386bdf89887d36ca18a68a72965b4f9206d779a26ece545d618540538246be5307c066e823ce55117208533cd9e668a6010222df diff --git a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild deleted file mode 100644 index b89a0735a841..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fortran-2 multilib-minimal - -DESCRIPTION="C and Fortran library for manipulating FITS files" -HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" -SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/10" -KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex -" -RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) -" -# Bug #803350 -DEPEND="${RDEPEND} - <dev-lang/cfortran-20110621 -" - -PATCHES=( - "${FILESDIR}/${PN}-3.490-ldflags.patch" - "${FILESDIR}/${P}-system-zlib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Avoid internal cfortran - mv cfortran.h cfortran.h.disabled || die - ln -s "${EPREFIX}"/usr/include/cfortran.h . || die - - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with bzip2) - $(use_enable curl) - $(use_enable threads reentrant) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if use tools ; then - emake utils - fi -} - -multilib_src_install_all() { - dodoc README docs/changes.txt - - dodoc docs/{quick,cfitsio,fpackguide}.pdf - dodoc docs/fitsio.pdf - - docinto examples - dodoc cookbook.c testprog.c speed.c smem.c - dodoc cookbook.f testf77.f - - # https://bugs.gentoo.org/855191 - if use tools; then - rm "${ED}/usr/bin/smem" || die - fi - - # Remove static libs - find "${ED}" -name '*.a' -delete || die -} diff --git a/sci-libs/cfitsio/cfitsio-4.4.0.ebuild b/sci-libs/cfitsio/cfitsio-4.4.0.ebuild deleted file mode 100644 index a27f43704cab..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.4.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib fortran-2 - -DESCRIPTION="C and Fortran library for manipulating FITS files" -HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" -SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/10" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl test threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex -" -RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) -" -# Bug #803350 -DEPEND=" - ${RDEPEND} - <dev-lang/cfortran-20110621 -" - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if ! grep -q 'CFITSIO_SONAME,10' configure.in; then - die "Update subslot!" - fi - - # fix libdir & sync SONAME to configure.in - sed -e 's:lib/:${CMAKE_INSTALL_LIBDIR}/:' \ - -e "/SOVERSION/s:VERSION :VERSION ${SLOT#0/}.:" \ - -e "s:SOVERSION :SOVERSION ${SLOT#0/}.:" \ - -i CMakeLists.txt || die - - # Avoid internal cfortran - rm cfortran.h || die -} - -multilib_src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - # used for .pc file - -DLIB_SUFFIX=${libdir#lib} - - -DUSE_BZIP2=$(usex bzip2) - -DUSE_CURL=$(usex curl) - -DUSE_PTHREADS=$(usex threads) - -DUSE_SSE2=$(usex cpu_flags_x86_sse2) - -DUSE_SSSE3=$(usex cpu_flags_x86_ssse3) - - -DTESTS=$(usex test) - -DUTILS=$(multilib_native_usex tools) - ) - cmake_src_configure -} - -multilib_src_install_all() { - dodoc README.md docs/changes.txt docs/*.pdf - - docinto examples - dodoc utilities/{cookbook.{c,f},testprog.c,testf77.f,speed.c,smem.c} -} diff --git a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild index 6fb7875c3962..bd4c4375ffd6 100644 --- a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" LICENSE="ISC" SLOT="0/10" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="bzip2 curl test threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" RESTRICT="!test? ( test )" diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch deleted file mode 100644 index 4b04fb9cc4fe..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2018-05-09 21:16:00.000000000 +0200 -+++ b/configure 2018-05-23 17:17:18.452431657 +0200 -@@ -4215,8 +4215,8 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --LDFLAGS="$CFLAGS" --LDFLAGS_BIN="$LDFLAGS" -+# LDFLAGS="$CFLAGS" -+LDFLAGS_BIN="$CFLAGS" - - if test "x$FC" = "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5 diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch deleted file mode 100644 index 9ec614616552..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur a/cfitsio.pc.cmake b/cfitsio.pc.cmake ---- a/cfitsio.pc.cmake 2022-10-31 19:40:23.000000000 +0100 -+++ b/cfitsio.pc.cmake 2022-12-14 23:35:53.572102437 +0100 -@@ -1,12 +1,12 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ - libdir=@LIB_DESTINATION@ --includedir=@INCLUDE_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@/cfitsio - - Name: cfitsio - Description: FITS File Subroutine Library - URL: https://heasarc.gsfc.nasa.gov/fitsio/ - Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@ - Libs: -L${libdir} -lcfitsio --Libs.private: @PKG_CONFIG_LIBS@ -lm --Cflags: -I${includedir} -+Libs.private: @PKG_CONFIG_LIBS@ -lm -z -+Cflags: -D_REENTRANT -I${includedir} diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch deleted file mode 100644 index fab375507f83..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2022-10-31 19:40:23.000000000 +0100 -+++ b/Makefile.in 2022-12-14 23:37:10.785099554 +0100 -@@ -102,7 +102,7 @@ - shared: lib${PACKAGE}${SHLIB_SUFFIX} - - lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} -- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} -+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} - @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ - ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ - ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -142,31 +142,31 @@ - ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< - - smem: smem.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz - - testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - speed: speed.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - testf77: testf77.o lib${PACKAGE}.a ${OBJECTS} -- ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - # Tested with bison 3.8 and flex 2.6.4 - eval: # Rebuild eval_* files from flex/bison source diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest index a86ef536b490..c6055fe29fb4 100644 --- a/sci-libs/clblas/Manifest +++ b/sci-libs/clblas/Manifest @@ -6,5 +6,5 @@ AUX clblas-2.12-reproducible-build.patch 669 BLAKE2B fb51f4ef1658becfa3e4e2e01af AUX clblas-2.12-use-boost-dynamic-libs.patch 597 BLAKE2B c65bfa09a6636041ef1816dc55c0a0874f747d49eb1ea5934dca5080dd86215ea40933cd156c2015eb73ba31a0c563343adf7048ac0eed03abfb3edbbeac6b46 SHA512 d32230ea4a707a78fd0e7d081176ee3d3cf814c749ae3eee4d4c1be8e08687eee458e1d538874ce47537a32832adaace8bf8918bf3ec37a3b63dcc35ce7f68d4 AUX clblas-2.12-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744 DIST clblas-2.12.tar.gz 1157445 BLAKE2B 27352a7775db94808ce21f2b4a39fe505d4f37be4305dc7fb5a4068a86d3f51a9e4863931f634150762b31256f9f7e8e5d0d8b70f404b5a9ddb8a489b800aea6 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72 -EBUILD clblas-2.12-r2.ebuild 1993 BLAKE2B ac8ed52611244a1086ea5ea17fb817d026346f94ac3ecdc62ea536fc7ec2c2d88911094be0c1387a6d09fb936d6943f4819aa23cb61637bc5e48aa551db018bc SHA512 1d9930dfc0f5252b0dfa2912a85bb43285e3af69db604c9e58556212ecfd2385ddf03a453426839b8e94484bd96a1d562a180fa13ee6cf6d1cfaef62cff2c36a +EBUILD clblas-2.12-r2.ebuild 1994 BLAKE2B 08b70f63c8ae94ba8927b4c04961bba17278f9094e10b8ed0c23ad995c728dc6511c687be89dff54398c838340f137ea9d8d36accb2abeb268fa72061c2bd08c SHA512 dbc9481249a64fb8d880d68aed47fcb7f48e70884d4a601fa4d58f01e239d08d67716d4c6d2429fc587853543075fdb4cb83fea15c3dda2853d82f9d4b142be2 MISC metadata.xml 1030 BLAKE2B ab71e8e4f7afd42ee2b257d4c693a93f21161013a5a41626155866a4b02e50f321900ae5ae9f6a0e53faac7c5aed5d7593b765c28794f2d2e083870b01bb5207 SHA512 9dcb1147165ba6a8917256872552e9e2f7f1fdc3a504a9783f65a93436cfe4a53e99bea7197102ffdae1fd722c7b04f3fc9f3916fef14737719559a0a49b820e diff --git a/sci-libs/clblas/clblas-2.12-r2.ebuild b/sci-libs/clblas/clblas-2.12-r2.ebuild index 654c43bcf00f..72bfd21c224c 100644 --- a/sci-libs/clblas/clblas-2.12-r2.ebuild +++ b/sci-libs/clblas/clblas-2.12-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DOCS_BUILDER="doxygen" DOCS_DEPEND="<dev-libs/mathjax-3" DOCS_CONFIG_NAME="clBLAS.doxy" diff --git a/sci-libs/coinhsl/Manifest b/sci-libs/coinhsl/Manifest deleted file mode 100644 index 986144ce822a..000000000000 --- a/sci-libs/coinhsl/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST coinhsl-2015.06.23.tar.gz 908522 BLAKE2B ccc64a7790b1f9105439f6690e87bed52ff48306132db5fa27a036b4ce87472dfc3ca92f3e9d94aefdf737ed292568f36831eb24ac94d77f4b9bab84bc3ea36e SHA512 ad831d6ffd3c1e46481da8e58c7075adc69cb02800002c2067053fd354c5971214025982b24a9b74c681c2c3d86fd5adac78820242209feb75898165cf38753f -EBUILD coinhsl-2015.06.23.ebuild 583 BLAKE2B 6b1656b77221ab29f0cad17c6809522f3c7eef4a9f3f90e927dd172fb11d515c867429e572e707faf118a9a65cad1d6f630d97618e742662e6848f9a3afab01f SHA512 496d4ac65b6e2c86e70fb0ea7638fb3b77445cc3b8261a31affa9a632c0b7ebea46421cfccf6a3fee60d4ec19e91500890bb8ca7846599282757c56ad504ee7e -MISC metadata.xml 582 BLAKE2B 48b8b78119773fe4fad4f11b9bfb5ccfa8c8bccee3ba3f15b9fb94532c46084cd31134cca595d979fc18d294b63eaf916aa38ec90b4e439133654e3f61ee42b9 SHA512 1a06c1acf8cf6e5248944ef01a0b1caf7f127224c82c0874ef72050d7af90d74399aefd32986be46aaf027d59165547a7c96bed663c65dbe4dbb32fe0ba323c9 diff --git a/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild b/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild deleted file mode 100644 index 9e1cac607992..000000000000 --- a/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_STANDARD="77 90" - -inherit fortran-2 toolchain-funcs - -DESCRIPTION="HSL mathematical software library for IPOPT" -HOMEPAGE="http://www.hsl.rl.ac.uk/ipopt" -SRC_URI="${P}.tar.gz" - -LICENSE="HSL" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - sci-libs/metis - virtual/blas" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -RESTRICT="mirror fetch" - -src_configure() { - export LIBS="$($(tc-getPKG_CONFIG) --libs metis blas lapack)" - default - MAKEOPTS+=" -j1" -} diff --git a/sci-libs/coinhsl/metadata.xml b/sci-libs/coinhsl/metadata.xml deleted file mode 100644 index 8225fda14e49..000000000000 --- a/sci-libs/coinhsl/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - HSL (formerly the Harwell Subroutine Library) is a collection of - state-of-the-art packages for large-scale scientific computation - such as the solution of sparse linear systems of equations and - sparse eigenvalue problems. This package is specific as a plugin for - Ipopt. - </longdescription> -</pkgmetadata> diff --git a/sci-libs/coinor-os/Manifest b/sci-libs/coinor-os/Manifest deleted file mode 100644 index 6c9c8de196bd..000000000000 --- a/sci-libs/coinor-os/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX coinor-os-2.10.1-fix-c++14.patch 4301 BLAKE2B c2bdef9b3bb9e5b8b8d5a9a93abaf71bfe71fd73fe33407f1860e5a350fd51885d35570b1f515826226470f169fa7d5e5976af71226b042841776938d1030983 SHA512 03f53d5a72ad7eef7305fcbd8ee7c07469c418f0e351b7bd84ccba5be0a0395aa5843d84fc7575f5a489a4632dafb651669ef56e760be4c50e69f6c45e24d96e -DIST OS-2.10.1.tgz 37106742 BLAKE2B 6cf206489e4a63c33a1610ca12d59fcb6607d58a053411d0f9cfa6896e85be82ec18387ffc2e8aae3bbff3326574e0938fdfae1ba96c3862c366d343149f559c SHA512 bfc0af075e0db2160db694ec1e6f69c36cd52b29449fcbd689c809db01a9cf5f6a8a59edb7fb7269db5757faa14da5cd9fef34dffc73de7b2953b35fc2b710f0 -EBUILD coinor-os-2.10.1.ebuild 1406 BLAKE2B 90a9cca0ea2b46d7501cf671d3c80510d781a3b018ea37cc1a5daa7ec1a7e566d9a475baa0e7cca23e09e33c8ee47e6d5e575a6c5dcd4bd1dbca3b5988fcb9f0 SHA512 0ccc1855a212a9901ab2b6644697b9725066b2ea1877f6e38b044d5608a004f286742ab6c4285488c61b98b94b2e3cf9aed65558c71a13038b737fd6962071ca -MISC metadata.xml 549 BLAKE2B f55d4702c3de238bd0d4cce5f38318ece8d3d862f94cd38dacd6a922a7373d9697552b8c740b9cf2fef4166db29448ac3ed3e6d94ce5a17f99db2d550c57e5a2 SHA512 224196b29600d09e1f9110ac7777f82d2d6fdcc6be81af738f46ff88115c8d498382de9c4d67b5ecf22b33a5559305156774e96b8b60d1ecffc8d2f292326e80 diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild deleted file mode 100644 index ab0da7313b7b..000000000000 --- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN=OS - -DESCRIPTION="COIN-OR Optimization Services" -HOMEPAGE="https://projects.coin-or.org/OS/" -SRC_URI="http://www.coin-or.org/download/source/${MY_PN}/${MY_PN}-${PV}.tgz" -S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}" - -LICENSE="EPL-1.0" -SLOT="0/6" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sci-libs/coinor-bcp:= - sci-libs/coinor-bonmin:= - sci-libs/coinor-couenne:= - sci-libs/coinor-clp:= - sci-libs/coinor-dylp:= - sci-libs/coinor-symphony:= - sci-libs/coinor-utils:= - sci-libs/coinor-vol:= - sci-libs/ipopt:=" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/doxygen[dot] ) - test? ( sci-libs/coinor-sample )" - -PATCHES=( - "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch" -) - -src_prepare() { - default - - # needed for the --with-coin-instdir - dodir /usr -} - -src_configure() { - append-cppflags -DNDEBUG - - # Can be dropped > 2.10.3 as patches landed upstream but don't - # apply cleanly to 2.10.1. - # bug #808793 - append-cxxflags -std=c++14 - - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --enable-dependency-linking \ - --with-coin-instdir="${ED%/}"/usr -} - -src_install() { - default - use doc && dodoc doc/*.pdf - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch b/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch deleted file mode 100644 index a788646abfe1..000000000000 --- a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch +++ /dev/null @@ -1,100 +0,0 @@ -Fix building with C++14, which errors out due to bool -> T* conversions -and changed semantics caught by -Werror=terminate. - -See also: https://bugs.gentoo.org/show_bug.cgi?id=594180 -Patch partially taken from: https://projects.coin-or.org/OS/changeset/5137/ - ---- a/src/OSCommonInterfaces/OSInstance.cpp -+++ b/src/OSCommonInterfaces/OSInstance.cpp -@@ -165,6 +165,9 @@ - }
-
- OSInstance::~OSInstance()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
- {
- std::ostringstream outStr;
-
---- a/src/OSCommonInterfaces/OSInstance.h -+++ b/src/OSCommonInterfaces/OSInstance.h -@@ -2267,7 +2267,11 @@ - OSInstance();
-
- /** The OSInstance class destructor */
-- ~OSInstance();
-+ ~OSInstance()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
-+ ;
-
- /** the instanceHeader is implemented as a general file header object
- * to allow sharing of classes between schemas
---- a/src/OSCommonInterfaces/OSMatrix.cpp -+++ b/src/OSCommonInterfaces/OSMatrix.cpp -@@ -2297,7 +2297,7 @@ - - if (!processBlocks(rowPartition, rowPartitionSize, - colPartition, colPartitionSize, false, symmetry)) -- return false; -+ return NULL; - return ExpandedMatrixByBlocks.back(); - }// end of MatrixType::getBlocks - ---- a/src/OSParsers/OSParseosil.tab.cpp -+++ b/src/OSParsers/OSParseosil.tab.cpp -@@ -180,7 +180,7 @@ - - #define GETATTRIBUTETEXT \ - for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \ -- if( *ch != '=') { osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return false;} \ -+ if( *ch != '=') { osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return NULL;} \ - ch++; \ - for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \ - if(*ch == '\"'){ \ -@@ -196,7 +196,7 @@ - *p = ch; \ - for( ; *ch != '\''; ch++); \ - } \ -- else { osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return false;} \ -+ else { osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return NULL;} \ - }\ - numChar = ch - *p; \ - attText = new char[numChar + 1]; \ -@@ -11070,7 +11070,7 @@ - // eat the white space - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - for(i = 0; sizeOf[i] == *ch; i++, ch++); -- if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return false;} -+ if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return NULL;} - // ch should be pointing to the first character after sizeOf - GETATTRIBUTETEXT; - ch++; -@@ -11080,7 +11080,7 @@ - // eat the white space - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - // better have an > sign or not valid -- if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return false;} -+ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return NULL;} - ch++; - // we are now pointing start of the data - const char *b64textstart = ch; -@@ -11089,7 +11089,7 @@ - const char *b64textend = ch; - // we should be pointing to </base64BinaryData> - for(i = 0; endBase64BinaryData[i] == *ch; i++, ch++); -- if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return false;} -+ if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return NULL;} - int b64len = b64textend - b64textstart; - b64string = new char[ b64len + 1]; - for(ki = 0; ki < b64len; ki++) b64string[ki] = b64textstart[ ki]; -@@ -11097,7 +11097,7 @@ - // burn the white space - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - // better have an > sign or not valid -- if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return false;} -+ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return NULL;} - ch++; - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - *p = ch; diff --git a/sci-libs/coinor-os/metadata.xml b/sci-libs/coinor-os/metadata.xml deleted file mode 100644 index ba6fc02b9b6f..000000000000 --- a/sci-libs/coinor-os/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - The objective of Optimization Services (OS) is to provide a set of - standards for representing optimization instances, results, solver - options, and communication between clients and solvers in a - distributed environment using Web Services. - </longdescription> -</pkgmetadata> diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 6ae296968f59..3e36eb7c1f23 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -9,7 +9,10 @@ DIST dealii-9.5.0-offline_documentation.tar.gz 412499027 BLAKE2B 521aa2488d84d48 DIST dealii-9.5.0-offline_documentation.tar.gz.asc 246 BLAKE2B 0a570885e80ad09ff154532b71c07e33894e93c96b3bca48dc8aae0b308883518cbb5eca57658c4e13de47efba47c3cb20bf376482ef7a26c6c0da93ee4dd689 SHA512 b63a9a0504fe5266b448ffda74e1d85ad5b6f344535c5b5f11d209546b51bb916ad69504ce5e4f1fd2287407c2d3d98a20b01bd830e8d45f510a85b7a057a8d5 DIST dealii-9.5.2.tar.gz 31523493 BLAKE2B 4ad55b0c4c7b1c02de17007f44b345856ec18127d6326b08fda76747087039344324c911409502f293e61eecd6d574f8a774ec0a1bbb200a2a4ee62a2f81e6d8 SHA512 5989c2dfd66f803b0bcc32816f69048c0bbb411c8b792691df9bbfc0c965c1c95c7e8c3782e1a3d160e9d124fd0c5396b55372e28e477fa474c3f3c03a5bd4e9 DIST dealii-9.5.2.tar.gz.asc 246 BLAKE2B bacd1dac5a6f3d0d6639329512f5c4cafe39ecd036a7a4e38b81d31b6ee452d496190e8ae26c814631cc62c42208a1df1cd081ac8accd97d2821d7091495b898 SHA512 1821b4763ddcda11baf37b88ae90ec73576d2cacdeb53f4196dcde9e1649e685eb1666b86317d4573944769642b09bc76fc1de34a5e8e436004552f8652cad23 -EBUILD dealii-9.4.2-r1.ebuild 6027 BLAKE2B a3b5c4c0b8e95102f5f95cd9e13518f906cc944ca43a873f65f6f4d463ab1eb4ad5c34927063603ea56d0ab29ee8c33366ac46a518fccc3395dacda837a04d51 SHA512 4200169cd5cb6fedd92027c57ad5f2d5b89fd0be6b826f258e84854deb122b396941b761ac8682aeccffdb53eea6601978a5fe098fb152f51630f676575a4684 -EBUILD dealii-9.5.2-r1.ebuild 5693 BLAKE2B 0a300659ca39ede2dd10ee9b5a54cc99102d40178272b9e783bff2c793f4d8f9ad5f6390f5b5379bba9ba557828ec6f6da5e4a0e52c27da4fe7f1ffb93e4d8c9 SHA512 6915052648fd66fe103fb654d0fa85e4d864f9730149531203e71559a9d75743e3b9fa5612035a86fba79ef4e50d30894cec321ca296bc2400fb295b0ba992b5 +DIST dealii-9.6.0.tar.gz 40829532 BLAKE2B 0219f7586a79b22810ac4bb0aa6eba4630dd8002f39abb76c920c5456a7c9cf6e3c3eb66a2670f8a0fc1158a7a186482e65b210743b7f9900c081c67199e0d34 SHA512 d65b3c73900589f84713ff8e926d2cd566501c2498fd64d314f71d4d525009f36d194693f92608b83cacc1ac985ea1c413fc6a4bbf8c7ff598645f7773a632b4 +DIST dealii-9.6.0.tar.gz.asc 246 BLAKE2B 3b34f1cc6df91c9052a1c00ce66e462ad8e735a921a37bb2228dcf7b1725b44d543cef40823c4cab01e77e55f09becef8a192492d99f412b21d18f5fd7bf9d64 SHA512 9d9e390399792c6f9a19a4e9666ace7657abf01d1ba489084dfa8d9729635022ae25c2e1b02c8825bddc149c8249402d65e8cf5c1bbe1441858109d0c93826a5 +EBUILD dealii-9.4.2-r1.ebuild 6038 BLAKE2B c40eacc59221b91a342919237171fe16bc8092189d1c4cb57fc3bd4c5c05af3ee58619d8e613be2d6181c80138d0463169272fe8805fb766fce1cfea50ac5071 SHA512 194ae81deec32c3da98610f7e28714d9f59c963eeb33538a07de7db1efdc1816e9792450d6b7c7cf934982b2d7126b56b3513657d2b93ade208413e2dbc70464 +EBUILD dealii-9.5.2-r1.ebuild 5704 BLAKE2B f15b66758e594fba1726f5aa5263aa3ea7c046e1825da8118f0a30ea214e25abb295b305885d90b30263ed838b1eace390422cbddb75dc065a2e76ae25bfcc5e SHA512 ff7081a7fb8c24fdd428b64d4df567509dd9c30559d4fc787e2e6f6b4dc801af451400c6a5cf5554076e9884fc407495c9bd95eec9ab8fa6dff5d60ec07c29b2 +EBUILD dealii-9.6.0.ebuild 5562 BLAKE2B 644bd108d4ac9616a33aae98938322ad631bdc06cf8e52a36e40e7f28888ec1d67bf38e6213f027f0c8144ec8d3921d2e6b0c7d894b98148ab6744f7e9211588 SHA512 2df99eba95d375ad5c4a6dfc76e1a123f0e5d421d50f3289750fdfb364fde708a8cb52ff8dd3a5f1d500ffd1286258aa37ec8cf639d1edb5517b4ae6bc81dde7 EBUILD dealii-9999.ebuild 5169 BLAKE2B 593ee88766dbcba2df2c6f06795f27b24fce1948b9cf8611e257662b9300b505b15623d79d7fef47060029b1982688040b28ada5622bc13380879d61142ffa51 SHA512 43ea2366f56d21e25e3a5c323daf63023e3dedcdb45908765fe1f8c31535fc6dd99a48c17f3000170347950bb844e56b58495c55613336698479bf87b25670db MISC metadata.xml 2301 BLAKE2B 27f29025acaf1cdf2637c9ce38b7d94cb63a29064c3fc315b86818e155cb675ac387998855498754d42f10abcbd3c14b92bd0d9ce503b24614490d2d45668166 SHA512 28ce9b2664538cdd933fe72fec79a85ad75fc5f451d14fb5946b92bba7d8c387e9e6226f831bc5b02e841f9e94c28d404f34a1211ed3a00a49eaff5a8d7dc8a1 diff --git a/sci-libs/dealii/dealii-9.4.2-r1.ebuild b/sci-libs/dealii/dealii-9.4.2-r1.ebuild index 20803dea7102..8fa359124ee9 100644 --- a/sci-libs/dealii/dealii-9.4.2-r1.ebuild +++ b/sci-libs/dealii/dealii-9.4.2-r1.ebuild @@ -79,7 +79,7 @@ DEPEND="${RDEPEND} doc? ( app-text/doxygen[dot] dev-lang/perl )" BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-dealii )" + verify-sig? ( <=sec-keys/openpgp-keys-dealii-20230904 )" PATCHES=( "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch diff --git a/sci-libs/dealii/dealii-9.5.2-r1.ebuild b/sci-libs/dealii/dealii-9.5.2-r1.ebuild index 8d1ff65c6e8c..772395b71298 100644 --- a/sci-libs/dealii/dealii-9.5.2-r1.ebuild +++ b/sci-libs/dealii/dealii-9.5.2-r1.ebuild @@ -85,7 +85,7 @@ DEPEND="${RDEPEND} doc? ( app-text/doxygen[dot] dev-lang/perl )" BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-dealii )" + verify-sig? ( <=sec-keys/openpgp-keys-dealii-20230904 )" PATCHES=( "${FILESDIR}"/${PN}-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch diff --git a/sci-libs/dealii/dealii-9.6.0.ebuild b/sci-libs/dealii/dealii-9.6.0.ebuild new file mode 100644 index 000000000000..bdf2169689c0 --- /dev/null +++ b/sci-libs/dealii/dealii-9.6.0.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# deal.II uses its own FindLAPACK.cmake file that calls into the system +# FindLAPACK.cmake module and does additional internal setup. Do not remove +# any of these modules: +CMAKE_REMOVE_MODULES_LIST="" + +inherit cmake flag-o-matic verify-sig + +DESCRIPTION="Solving partial differential equations with the finite element method" +HOMEPAGE="https://www.dealii.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dealii/dealii.git" + SRC_URI="" +else + DOC_PV=9.5.0 + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc ) + doc? ( + https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz + verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc ) + )" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE=" + adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f + cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 + +lapack metis mpi muparser opencascade p4est petsc scalapack slepc + +sparse sundials symengine trilinos +" + +# TODO: add slepc use flag once slepc is packaged for gentoo-science +REQUIRED_USE=" + arborx? ( trilinos ) + p4est? ( mpi ) + slepc? ( petsc ) + trilinos? ( mpi )" + +RDEPEND="dev-libs/boost:= + app-arch/bzip2 + sys-libs/zlib + dev-cpp/tbb:= + arborx? ( sci-libs/arborx[mpi=] ) + adolc? ( sci-libs/adolc ) + arpack? ( sci-libs/arpack[mpi=] ) + assimp? ( media-libs/assimp:= ) + cgal? ( sci-mathematics/cgal ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + ginkgo? ( sci-libs/ginkgo ) + gmsh? ( sci-libs/gmsh ) + gsl? ( sci-libs/gsl:= ) + hdf5? ( sci-libs/hdf5:=[mpi=] ) + lapack? ( virtual/lapack ) + metis? ( + >=sci-libs/metis-5 + mpi? ( >=sci-libs/parmetis-4 ) + ) + mpi? ( virtual/mpi[cxx] ) + muparser? ( dev-cpp/muParser ) + opencascade? ( sci-libs/opencascade:= ) + p4est? ( sci-libs/p4est[mpi] ) + petsc? ( sci-mathematics/petsc[mpi=] ) + scalapack? ( sci-libs/scalapack ) + slepc? ( sci-mathematics/slepc[mpi=] ) + sparse? ( sci-libs/umfpack ) + sundials? ( sci-libs/sundials:= ) + symengine? ( >=sci-libs/symengine-0.4:= ) + trilinos? ( sci-libs/trilinos ) + || ( + dev-cpp/kokkos + sci-libs/trilinos + ) + " + +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-text/doxygen[dot] dev-lang/perl )" + +BDEPEND=" + verify-sig? ( >=sec-keys/openpgp-keys-dealii-20240811 )" + +PATCHES=( +) + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc" + +src_configure() { + # deal.II needs a custom build type: + local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) + + local mycmakeargs=( + -DDEAL_II_PACKAGE_VERSION="${PV}" + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF + -DDEAL_II_ALLOW_AUTODETECTION=OFF + -DDEAL_II_ALLOW_BUNDLED=OFF + -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF + -DDEAL_II_COMPILE_EXAMPLES=OFF + -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html" + -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}" + -DDEAL_II_COMPILE_EXAMPLES=OFF + -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples" + -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)" + -DDEAL_II_SHARE_RELDIR="share/${PN}" + -DDEAL_II_WITH_ZLIB=ON + -DDEAL_II_WITH_ADOLC="$(usex adolc)" + -DDEAL_II_WITH_ARBORX="$(usex arborx)" + -DDEAL_II_WITH_ASSIMP="$(usex assimp)" + -DDEAL_II_WITH_ARPACK="$(usex arpack)" + -DDEAL_II_WITH_CGAL="$(usex cgal)" + -DDEAL_II_WITH_CUDA="$(usex cuda)" + -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" + -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" + -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" + -DDEAL_II_WITH_GMSH="$(usex gmsh)" + -DDEAL_II_WITH_GSL="$(usex gsl)" + -DDEAL_II_WITH_HDF5="$(usex hdf5)" + -DDEAL_II_WITH_LAPACK="$(usex lapack)" + -DDEAL_II_WITH_METIS="$(usex metis)" + -DDEAL_II_WITH_MPI="$(usex mpi)" + -DDEAL_II_WITH_MUPARSER="$(usex muparser)" + -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)" + -DDEAL_II_WITH_P4EST="$(usex p4est)" + -DDEAL_II_WITH_PETSC="$(usex petsc)" + -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)" + -DDEAL_II_WITH_SLEPC="$(usex slepc)" + -DDEAL_II_WITH_SUNDIALS="$(usex sundials)" + -DDEAL_II_WITH_SYMENGINE="$(usex symengine)" + -DDEAL_II_WITH_UMFPACK="$(usex sparse)" + -DDEAL_II_WITH_TBB=ON + -DDEAL_II_WITH_TASKFLOW=OFF + -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" + ) + + use opencascade && mycmakeargs+=( + -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" + ) + + # Do a little dance for purely cosmetic QA reasons. The build system + # does query for the highest instruction set first and skips the other + # variables if a "higher" variant is set + if use cpu_flags_x86_avx512f; then + mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes ) + append-cxxflags "-mavx512f" + elif use cpu_flags_x86_avx; then + mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) + append-cxxflags "-mavx2" + elif use cpu_flags_x86_avx; then + mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) + append-cxxflags "-msse2" + fi + + cmake_src_configure +} + +src_install() { + if use doc && [[ ${PV} != *9999* ]]; then + # copy missing images to the build directory: + cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ + "${BUILD_DIR}"/doc/doxygen/deal.II || die + # replace links: + sed -i \ + 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ + "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" + fi + cmake_src_install + + # decompress the installed example sources: + use examples && docompress -x /usr/share/doc/${PF}/examples +} diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest index 47a9d130c938..aa69dda4258e 100644 --- a/sci-libs/dlib/Manifest +++ b/sci-libs/dlib/Manifest @@ -1,5 +1,3 @@ DIST dlib-19.24.2.tar.gz 22252165 BLAKE2B cd6a911e16d9ff6cf94a4334e84983a9c48da42e3f696de20fb28a5bba9720507ec19ddc984bb753288f86359a1c19cdf15ed29f18c43769a1c17d3177d8dedf SHA512 a38a3079c169b16d81d7aca9fc294bcd63bd2dc1a21573f9141ca310542da3629b6523fa6f348be8b41bf5b478c0846a13a4c3fee77f1ac38dfbfc4a01effb57 -DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199 -EBUILD dlib-19.24.2.ebuild 2513 BLAKE2B a593d1d7842022e8b58650a1cfd9ed8b0bcd3b4c8e058e3846cf43fac4bce02664a6914274f783b49ad455edefa6eb066eb073d998d1f86b6ab5ae9aa91426b4 SHA512 45a7c8e72572a336d874cabd125695028c369dedee5974b73ae3f7285e789c43f1e02f09b93548d40786b83f80ededa1dee6ebabed1cdf858dab376407b15ac2 -EBUILD dlib-19.24.ebuild 2513 BLAKE2B 8faf0274b9ef05963a34b12c2bd47fdf89999d0af7cde697ad671b5de39b565a0b23ca555c1824575781e6bd2cf9fe2cbe8e55673e74ecc14e67ec5ab768b342 SHA512 d3934515077f1d3810bf7dbec5c37b480c615ce24075ef0048c3076eeaf1122d32f1d241620f77231c2fc6c508bb074b9bf886055e639a77298060b3c8eb7b6a +EBUILD dlib-19.24.2.ebuild 2530 BLAKE2B 6bd30eae48a08ba1626a021766104f476d7e566f24efb93d236ca8a4413577406b29a811d97f49064fef96e9fbf8d63d82df30b4c8284ca35e16caecf8336d59 SHA512 69ec18776c92dc7d8bff65adc33624dd6b0f5fcef6ad30d9681838b02a5b67bd60f07689ddd5b6f3a093f324af4f321e25e96e20b6bacf17121d985531c759d9 MISC metadata.xml 1003 BLAKE2B 3c4e623c6abbd4d1ec8a9402009b2d01e6edb547bfd24f03c27853d0386170833553feecc7b0f6b751a3ad4e52f0575a4a87fbcf801a0952fc3d4e5c77645a43 SHA512 2c59cabd74e9433b9b31b96d1f476c2c9200cce51960c09de5ebd7aabbfe4cff1f4449a6a9ecaaf1907f58dd12c04039a9f58f69f2d036bc18bf82b4438cbc01 diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild index dd936a0dc155..f7967da999d3 100644 --- a/sci-libs/dlib/dlib-19.24.2.ebuild +++ b/sci-libs/dlib/dlib-19.24.2.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 inherit cmake cuda distutils-r1 diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild deleted file mode 100644 index 7390b5b72a3d..000000000000 --- a/sci-libs/dlib/dlib-19.24.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -inherit cmake cuda distutils-r1 - -DESCRIPTION="Numerical and networking C++ library" -HOMEPAGE="http://dlib.net/" -SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -# doc needs a bunch of deps not in portage -RDEPEND=" - cblas? ( virtual/cblas ) - cuda? ( dev-libs/cudnn:= ) - gif? ( media-libs/giflib:= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - lapack? ( virtual/lapack ) - mkl? ( sci-libs/mkl ) - png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3 ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND}" -BDEPEND=" - python? ( - ${DISTUTILS_DEPS} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - ) - ) -" - -DOCS=( docs/README.txt ) - -src_prepare() { - use cuda && cuda_src_prepare - cmake_src_prepare - use python && distutils-r1_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDLIB_ENABLE_ASSERTS=$(usex debug) - -DDLIB_ENABLE_STACK_TRACE=$(usex debug) - -DDLIB_GIF_SUPPORT=$(usex gif) - -DDLIB_JPEG_SUPPORT=$(usex jpeg) - -DDLIB_PNG_SUPPORT=$(usex png) - -DDLIB_LINK_WITH_SQLITE3=$(usex sqlite) - -DDLIB_NO_GUI_SUPPORT=$(usex X OFF ON) - -DDLIB_USE_BLAS=$(usex cblas) - -DDLIB_USE_CUDA=$(usex cuda) - -DDLIB_USE_LAPACK=$(usex lapack) - -DUSE_AVX_INSTRUCTIONS=$(usex cpu_flags_x86_avx) - -DUSE_SSE2_INSTRUCTIONS=$(usex cpu_flags_x86_sse2) - -DUSE_SSE4_INSTRUCTIONS=$(usex cpu_flags_x86_sse4_1) - ) - cmake_src_configure - use python && distutils-r1_src_configure -} - -src_compile() { - cmake_src_compile - use python && distutils-r1_src_compile -} - -src_test() { - ( - local BUILD_DIR="${BUILD_DIR}"/dlib/test - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" >/dev/null || die - - local CMAKE_USE_DIR="${S}"/dlib/test - cmake_src_configure - cmake_build - - ./dtest --runall || die "Tests failed" - ) - - use python && distutils-r1_src_test -} - -python_test() { - epytest -} - -src_install() { - cmake_src_install - use python && distutils-r1_src_install - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF} - fi -} diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest index cb44e6e498c4..7d24a68a28c0 100644 --- a/sci-libs/fflas-ffpack/Manifest +++ b/sci-libs/fflas-ffpack/Manifest @@ -1,13 +1,7 @@ -AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec -AUX fflas-ffpack-2.4.3-fix-internal-linking.patch 2599 BLAKE2B f0bdb27bc8fdc62661c651f6d292774b5c130dadcec39116eceb65e09a771218a83eadb4986285477edb10c7b273629f9bf91cb43449f137f18310c347dae0a3 SHA512 5ab624546d52833fa5797890520771718ee89127149dc208f3e0cd4b1399741724576949b824539bc6612b625ce64a00a903ba3ac003d2c85104a1faf10f1434 AUX fflas-ffpack-2.4.3-fix-pc-libdir.patch 586 BLAKE2B 030fab1e53b4584816ccd8961357c9d6c47375cb02d56b65cf5b53bfc659a5c2ee36dd2563f5c1a62b0dbcd0dc841d53bba5da0709f589c9dfb5f87f3d3cfd71 SHA512 11607abe8bf71ba50eaba74dc660261c768c5d01cd2f6775c642bc7878a32bb718575b4cbcf8de9de51defdef658ce377193912c35dc3bf045753543882a9087 -AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c3857385791a5c24c00ee2327192fd1c5dcb1a169ad97fa50d21124f054737dd6a1dd1c5c10377865b5b144b31eed728dedc89ea001 SHA512 8d6b3c9bd6637f1c3bf43ce722e96bd9e48b0e271cec1fb4ae72ab2e99ac7b436626385dd2e39781959248506c19474ac062c8ced2c63db80553150f8e7a0287 AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1 -AUX fflas-ffpack-2.4.3-no-test-fgesv.patch 1268 BLAKE2B 51c0cf74dac9b296a944e918475807e97a2cf71f066cda9c067b63b344e260b9fbb9ea2851db7ac2170e2b239c0778be0c9a99e0efbbbb9215df921197208784 SHA512 9a57cba58a6bab69092c4d335d92994651bb51d2f4e867d4f0396813e14f492d720232779615299b5203603bb76553ec8a4881ffb9677c349f22c0ef3975df0d AUX fflas-ffpack-2.5.0-blaslapack.patch 2009 BLAKE2B d6a6e8cbc3b57578efae7638f3a3bd62b233047f83f1c40ea5b5aab08b7f0f372cec1c7f769ca03c21270c9d7380622131d166d6fcef921941fc320c88cbb81f SHA512 cb584bd58a712bd28b95a99ee489fd0fcd1e349559d96498372674e6b86f6e699bcbc7a1db806a53bd6aff4358899754f0fead8b8b9d1414256f9dce15c6e81d AUX fflas-ffpack-2.5.0-no-test-fsyr2k.patch 867 BLAKE2B 447ffa94a3688e034727eb6feba0c9feb012a6cf09f0ff3d3a52e6ee7cf8565ad4d2b255c4562c062235ee0eda3ba8b7f15b9572f07c94af7b7f24fe524086df SHA512 05266956377cd16aa7e5e18882d9b86069618a29f981da33276f9ed87e2f0d34a5b09e608863533abf55297c4c8554d7a2b6593e455c90676a4ff3fff810df34 -DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44 DIST fflas-ffpack-2.5.0.tar.gz 1098354 BLAKE2B 34b0cd218e83a71c6540b1768c8231246a0dc360eb7e2353a923b5870d228e702291de14b0dc3e7c5055727fbd62e2bc1bd1d2ac432dd99df978a1edb513bfc0 SHA512 6753022f27d354160f5eb436c713002f61d24e9a942f2463e36bf324b19ec096f34dd9cacb8529ba566f245f88fa303dcfb448a40d0c39d340f7c337cd1788a4 -EBUILD fflas-ffpack-2.4.3-r3.ebuild 2228 BLAKE2B fbb0b1ad23f85a77ed93175a1c8d8d9426a2c931e6fe935a33117291a77d0d20c2773e7d286f944796f222c5234ddb60be21d6aa61c20f9d97995e18fe05fd09 SHA512 6a0eb0437c2cdbcc064c71487edf8d7a8ea3c79e8eca641c428b2412d9480300ab736414b9cb2d870239d17b4edfaaa17d60afabadb412b255995c658e9115f5 EBUILD fflas-ffpack-2.5.0-r1.ebuild 1266 BLAKE2B 6c9a5d9bdf7cf52bd0400f4dd4c016195e9b2342c970213279189581ed75cf23e728a55d80c9228494f3969d97ee297bd3502b86f55833b28be5c33ce022a1c9 SHA512 bf3516d572e2939ec6d529d0602a41e1c7dfa7e97a33b54a079e170a7ea4a725c9cbf5f7e5daf5e8e89febae2771c02894aeddf085688d55add645aa69db05e2 MISC metadata.xml 1492 BLAKE2B 46a6b13fb1bae6f2aa43a9d7a96c7882d4d7de4b885a4ac92f320f72ce3076ad820c4c5f75c0f2d60334801d2764c20524ea26c1cc6c9975be13e00906708927 SHA512 fc6d90e2945f67a32594f601df69952baec0821d1e529a03c8dc332723848ca531f747efe7c30ea00885c4c4a081cdb81c0ea05085e7ca3acd7db304bb4f468b diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild deleted file mode 100644 index f5b94166a028..000000000000 --- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="Library for dense linear algebra over word-size finite fields" -HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/" -SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl" - -# Our autotools patch hacks in PKG_CHECK_MODULES calls. -BDEPEND="virtual/pkgconfig" -DEPEND="virtual/cblas - virtual/blas - virtual/lapack - dev-libs/gmp[cxx(+)] - =sci-libs/givaro-4.1*" -RDEPEND="${DEPEND}" - -# The no-test-echelon patch works around a test failure that may -# eventually be fixed upstream. Gentoo bug 725446 and upstream -# Github issue 282. Same for test-fgesv (bug 807100). -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-blaslapack.patch" - "${FILESDIR}/${P}-no-test-echelon.patch" - "${FILESDIR}/${P}-no-test-fgesv.patch" - "${FILESDIR}/${P}-fix-internal-linking.patch" - "${FILESDIR}/${P}-no-fabi-version.patch" - "${FILESDIR}/${P}-fix-pc-libdir.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - - econf \ - --enable-precompilation \ - $(use_enable openmp) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) \ - $(use_enable cpu_flags_x86_avx512f avx512f) \ - $(use_enable cpu_flags_x86_avx512dq avx512dq) \ - $(use_enable cpu_flags_x86_avx512vl avx512vl) -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch deleted file mode 100644 index 3154a2618196..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5b46b18..5e0264a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,49 +248,24 @@ dnl echo '********************************************************************** - dnl exit 1 - dnl ]) - --BLAS_FOUND=false -- --FF_CHECK_BLAS_CFLAGS --FF_CHECK_BLAS_LIBS --FF_CHECK_MKL --FF_CHECK_USER_BLAS --FF_CHECK_USER_LAPACK -- --FF_OPENBLAS_NUM_THREADS -- --# FF_CHECK_BLAS -- --# FF_CHECK_GOTOBLAS -- --# FF_CHECK_GSL -- --# if test "$BLAS_FOUND" = "false" ; then -- # FF_CHECK_CBLAS --# fi -- --# if test "$BLAS_FOUND" = "false" ; then -- # FF_CHECK_OTHERBLAS --# fi -- --# FF_CHECK_LAPACK -- --# if test "$BLAS_FOUND" = "false" ; then -- # FF_CHECK_BLAS2 --# fi -- -- -- --# BLAS_LIBS="${BLAS_LIBS}" --# BLAS_LIBS="-L/${BLAS_PATH} ${LAPACK_LIBS} ${BLAS_LIBS}" --# AC_SUBST(BLAS_LIBS) -- --# FF_CHECK_CUDA -- --# AM_CONDITIONAL(FFLASFFPACK_HAVE_BLAS, test "x$BLAS_FOUND" != "xfalse") -- -- --# FF_BENCH -- -+PKG_PROG_PKG_CONFIG -+ -+PKG_CHECK_MODULES([BLAS], [cblas blas],[ -+ AC_DEFINE(HAVE_BLAS,1,[Define if BLAS is installed]) -+ AC_DEFINE(HAVE_CBLAS,1,[Define if C interface to BLAS is installed]) -+ HAVE_BLAS=yes -+ BLAS_PATH="" -+ CBLAS_LIBS="${BLAS_LIBS}" -+ AC_SUBST(BLAS_LIBS) -+ AC_SUBST(CBLAS_LIBS) -+ AC_SUBST(BLAS_CFLAGS) -+ AC_SUBST(BLAS_PATH)]) -+ -+PKG_CHECK_MODULES([LAPACK], [lapack],[ -+ AC_DEFINE(HAVE_LAPACK,1,[Define if LAPACK is installed]) -+ AC_SUBST(LAPACK_LIBS)]) -+ -+AM_CONDITIONAL(FFLASFFPACK_HAVE_LAPACK, test "x$HAVE_LAPACK" == "x1") - - FF_DOC - -diff --git a/fflas-ffpack-config.in b/fflas-ffpack-config.in -index f1dac22..17633a0 100644 ---- a/fflas-ffpack-config.in -+++ b/fflas-ffpack-config.in -@@ -107,11 +107,11 @@ while test $# -gt 0; do - ;; - - --libs) -- echo @PARLIBS@ @PRECOMPILE_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@ -+ echo @PARLIBS@ @PRECOMPILE_LIBS@ @LAPACK_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@ - ;; - - --blas-libs) -- echo @BLAS_LIBS@ -+ echo @LAPACK_LIBS@ @BLAS_LIBS@ - ;; - - --blas-home) diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch deleted file mode 100644 index 5f085554c33f..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sat, 7 Aug 2021 08:14:44 -0400 -Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal - linking. - -This is just, - - https://github.com/linbox-team/fflas-ffpack/pull/339 - -but rebased onto the old release tarball. ---- - fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++-------------- - 1 file changed, 8 insertions(+), 14 deletions(-) - -diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am -index 8c56746..449f6e4 100644 ---- a/fflas-ffpack/interfaces/libs/Makefile.am -+++ b/fflas-ffpack/interfaces/libs/Makefile.am -@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs - - AM_CXXFLAGS = @DEFAULT_CFLAGS@ - AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/ -I$(top_srcdir)/fflas-ffpack/ffpack -I$(top_srcdir)/fflas-ffpack/field --LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS) - #AM_LDFLAGS=-static - - -@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \ - fflas_L3_inst.C \ - fflas_L3_inst_implem.inl - --libfflas_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined -+libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) -+libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - libffpack_la_SOURCES= ffpack_inst.C \ - ffpack_inst_implem.inl --libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la -- --EXTRA_libffpack_la_DEPENDENCIES= libfflas.la -+libffpack_la_LIBADD= libfflas.la -+libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - libfflas_c_la_SOURCES=fflas_lvl1.C \ - fflas_lvl2.C \ - fflas_lvl3.C \ - fflas_sparse.C - #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED --libfflas_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la -- --EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la -+libfflas_c_la_LIBADD= libfflas.la -+libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - libffpack_c_la_SOURCES=ffpack.C - #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED --libffpack_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined -lfflas -lffpack --EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la -+libffpack_c_la_LIBADD= libffpack.la -+libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - - EXTRA_DIST=c_libs.doxy --- -2.31.1 - diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch deleted file mode 100644 index 48ae6c37166a..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 11364be98b200405630117d5eebb33bfdbc8c19e Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sat, 7 Aug 2021 12:09:39 -0400 -Subject: [PATCH 1/1] configure.ac: don't append -fabi-version=6 to CXXFLAGS. - -This is a quick hack to avoid appending -fabi-version=6 to CXXFLAGS. -Both givaro and fflas-ffpack have problems with this legacy cruft -that are fixed upstream but tough to backport. We don't support -compilers that old, so we can just delete it. ---- - configure.ac | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 571d923..616b2f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -179,10 +179,6 @@ AC_SUBST(SIMD_FLAGS) - dnl gcc-4.9.2 bug See https://trac.sagemath.org/ticket/17635#comment:178 - AS_IF([ test "x$CCNAM" = "xgcc492" ],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fpermissive"],[]) - --dnl With GCC's default ABI version, a __m128 or __m256 are the same types and therefore we cannot --dnl have overloads for both types without linking error. --AS_IF([test "x$CCNAM" = "xgcc"],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"],[]) -- - AC_SUBST(REQUIRED_FLAGS) - - PARFLAGS="${OMPFLAGS}" --- -2.31.1 - diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch deleted file mode 100644 index a995c0518566..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3f7a5f601e73491ac7c39cc848fa98fe6224978c Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 16 Aug 2021 21:19:39 -0400 -Subject: [PATCH 1/1] tests/Makefile.am: disable test-fgesv. - -This test can fail on Gentoo, and has been reported upstream. In the -meantime, having it fail on end users is no good, so we disable it. - -Gentoo-bug: https://bugs.gentoo.org/807100 -Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/341 ---- - tests/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 62e92bc..83cf71f 100755 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -63,7 +63,6 @@ BASIC_TESTS = \ - test-io \ - test-maxdelayeddim \ - test-solve \ -- test-fgesv \ - test-simd \ - test-fgemv \ - test-nullspace \ -@@ -143,7 +142,6 @@ test_ftrtri_SOURCES = test-ftrtri.C - # test_fullranksubmatrix_SOURCES = test-fullranksubmatrix.C - # test_invert_SOURCES = test-invert.C - # test_krylov_elim_SOURCES = test-krylov-elim.C --test_fgesv_SOURCES = test-fgesv.C - # test_frobenius_SOURCES = test-frobenius.C - test_nullspace_SOURCES = test-nullspace.C - test_fdot_SOURCES = test-fdot.C --- -2.31.1 - diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 4646935515fe..1146a1fd8649 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -1,4 +1,4 @@ DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 -EBUILD fftw-3.3.10.ebuild 4017 BLAKE2B fec696c07522b2b2761cf6228224224f5b86551800192371b42c1c5ddda221c14b985040c42a3c5001614f6a19bc795f7d5dc428035cc221d47d97e8f9002da8 SHA512 89f83da18d3112f6f9ec3baa9be1d4b361fb0fe2b84fc4bd870d5ebcf3f54bbfa2441802c3140be1c6334ddeb501c662747f5edda2d2d583cf8c6ce8be51c50d -EBUILD fftw-9999.ebuild 4012 BLAKE2B 4acc326f3ea2c3d68018aada983a6df9a82a60e8deaf2072b1c0649c4b6a673f3f9a96bfa2747d092de9c99199de4aed38bd07ce46bb8d9b5818cc4feed3ca29 SHA512 861ba96a2f2952dfc72b92db0647719f48443f11e7fbf39ebfe699acc231da40fcb325d29642b535811aa5bc3eb227afdb6eab64e547b85c23859e8807f5e844 +EBUILD fftw-3.3.10.ebuild 4210 BLAKE2B 96f886b1649993be0fb1dece20e99a00e9b2210c86c525f7f4a409b1b65491cf340d82218f1b922713d5427281ff51fc5a19eb8c7eb1ba8b76ce4666d4a19dab SHA512 910cd16df0a908f24ba7c84958449ad11203c31c7b4f39b73206ce1402cae260545cec76e08f458da3f62e02b1dc77e1b3fd220e33dc4c822683912d47fe8df1 +EBUILD fftw-9999.ebuild 4205 BLAKE2B 00c641a62953988e558e3f6fc582d2aaf9adcfe24661b3717b0db77045e8fc6cfacb55a5477a6c544c1750dddf1d5f51c6bb632725f61aaaa86b0ca0d00688b7 SHA512 b3d3a625939a3204609600e2dcf0453aa279da53baecdc10f582534844f344719ec9c4197ff79a5bd8f58628958189e11f6a9d2913b76de93aad91ca4549f7b9 MISC metadata.xml 914 BLAKE2B beea3b7d30a0b0568e8741f15600acdb0652e2c33f3ef5f95d0d0a4f4efb2aacb3c7215bbc3abbae67764d5b36a1e0caae99d641be20183fe5bb2ce069bd7db1 SHA512 2bbb2863f5617f387d4b382caa77e894a485e819ebd852939830c585e762c8e3a2d05532bdf2f44b2d59294f0dbec3b14dca6f2c00bdbc547331db7eddc6c9ce diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild index 213b53606d55..ea7a5189348f 100644 --- a/sci-libs/fftw/fftw-3.3.10.ebuild +++ b/sci-libs/fftw/fftw-3.3.10.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 FORTRAN_NEEDED=fortran -inherit fortran-2 multibuild multilib-minimal toolchain-funcs +inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" HOMEPAGE="https://www.fftw.org/" @@ -33,6 +33,12 @@ BDEPEND="test? ( dev-lang/perl )" HTML_DOCS=( doc/html/. ) +QA_CONFIG_IMPL_DECL_SKIP=( + # check fails with any version of gcc. On <14: + # <artificial>:(.text.startup+0x19): undefined reference to `_rtc' + _rtc +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -50,8 +56,12 @@ pkg_setup() { src_prepare() { default - # fix info file for category directory - [[ ${PV} == *9999 ]] && eautoreconf + if [[ ${PV} == *9999 ]]; then + # fix info file for category directory + eautoreconf + else + elibtoolize + fi } multilib_src_configure() { diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index f3fa7dd693b0..176526968102 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 FORTRAN_NEEDED=fortran -inherit fortran-2 multibuild multilib-minimal toolchain-funcs +inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" HOMEPAGE="https://www.fftw.org/" @@ -33,6 +33,12 @@ BDEPEND="test? ( dev-lang/perl )" HTML_DOCS=( doc/html/. ) +QA_CONFIG_IMPL_DECL_SKIP=( + # check fails with any version of gcc. On <14: + # <artificial>:(.text.startup+0x19): undefined reference to `_rtc' + _rtc +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -50,8 +56,12 @@ pkg_setup() { src_prepare() { default - # fix info file for category directory - [[ ${PV} == *9999 ]] && eautoreconf + if [[ ${PV} == *9999 ]]; then + # fix info file for category directory + eautoreconf + else + elibtoolize + fi } multilib_src_configure() { diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 904819fef51f..f1c6878355fe 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -7,10 +7,13 @@ AUX gdal-3.8.5-poppler-24.05.0.patch 1007 BLAKE2B b0bed1a9b145226581e9047c0d810e DIST gdal-3.8.0.tar.xz 8853728 BLAKE2B 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d SHA512 42b3a381190922e546ae83355f56532b92d519b1eac357a9c116ee19b67b67362f282e248e2d82c14ae04cae04dce175bb652f481879442ffa5b58f764a088dd DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349 SHA512 4cdf1c45ea110cf6ba6ffe5b890ebd8f82654899ed6224ede6c59864f28626c758b5ea15f26c1840a4d3f70abaf9c1255754c565ef2fe5e5b39e0499ace63521 DIST gdal-3.9.0.tar.xz 9081116 BLAKE2B 5b1453b889768359d36c6da435b27f6d31bb1ba95cecfd05d525d63258100705778d2675219711d0c2ab0e2392dd0eabffa1af3ffd055ebfc14840aaa1e768c0 SHA512 05e50a3898b4c71351125c59b0058eb8213858ef14f213b251dee44638522e7e87ed660d028677803a74728543531b0f438e53a543e6529bb8cdc391e9a09b02 +DIST gdal-3.9.1.tar.xz 9098844 BLAKE2B a9c5c20b1bc704a331ea54f1575f655197075dde75fa6144cff43763d57d64b9bd6e3c7a40bedb919567b45185688b206a3cc13278d0605c5be0b895b403bbab SHA512 5f4edc65ffb1eb187fa83259a25f4a078fbc75e21b39d21b17660a8ccf3322ca13de263ff91531cdf7a2e2871d1dd4275b88af37c122080fc16bef2436e1edb6 DIST gdalautotest-3.8.0.tar.gz 15615239 BLAKE2B fa524bb796a6f5b28bea79b51c4ce34e231b1d10a108a4590e30a48dc946df45880828a5a1ee0db07ed191e0f7dd5631fb294f3a73d1ce24244b6132f5cc3de1 SHA512 e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431 DIST gdalautotest-3.8.5.tar.gz 15711701 BLAKE2B 3f0a5ba7f6a2072aaf46e2867739faaba9fae89f2679ad5cb4cb356112b197141e996fc10365bb6a95c3fce648a440bd746aa68f5c52a8743995cf696d230ef0 SHA512 18251e2fe5870bcbbde9c4278d7ce969feb6397a727679f56e6cf051cf5a3ded29217c034566cb9c5ebb02d51ad4d12933ab918eeadb0017c78859892bbf4f19 DIST gdalautotest-3.9.0.tar.gz 16280839 BLAKE2B e9d294dcbf98b052889b807992ec435837da37a8ecf6bf97ab3cac5c798feea4f69c930cfcecbe072f959c140788136f34525fed9086e14d9bf4fb1fe44e0113 SHA512 411037da7c8de6985dad7b5f3868527b8f59b280a2b7fd29addab81ae1ae58f8611843de355d9a39ea3fca09001b7931c669f379e88b407116784e597b2cda7f +DIST gdalautotest-3.9.1.tar.gz 16681261 BLAKE2B c6eecb5bdd3d9b9730f49ba88dc9d5c1098990f1dfe34b9a181bf30a71570d382b36a7d22026e8ebb3c2e6e24ae4a4de321f70d6960784aed283d7e7511cb578 SHA512 e35c3dbd4239b1404b0fb774dae1d675bdfbc406d97ac909ec0e20b57d60fbc9236158871249fbdf9e3fb727b3d16a13a366803462afde9f2be4cb1efd91bf6e EBUILD gdal-3.8.0-r1.ebuild 7643 BLAKE2B 38adb7951372403eff4aa19e013e8982ca3a06f3891572e4ec1316667a96bb1e864fb5be5c026dbafefeb42b6b72b7c320556a0a078fcb003fa8382cb2e3ebb8 SHA512 695c5ea85a7fc45cd2d7516ea430721a5c423b2b907d454f364d0a197a36b0120df7028c19d6b885d3bb19c64e0cd237af72a48a78d456a418fce27dee6e14d8 EBUILD gdal-3.8.5.ebuild 7598 BLAKE2B b4e9d315edd0e7831048f6175d2a81a19b57c8ab1f480329e7a53ac973ed85df4bbe74b61e7865df9457132cd4cc54d408acecdc6b598dbe10974a1ecd81b246 SHA512 82c54f34fcbbe591ebedbf13000193fd09424875157afae0d91a25f93c1561673810ffbce4d7a86e163052c85fbd6fe1577800ac81d63e838c71f593e730f002 EBUILD gdal-3.9.0.ebuild 7576 BLAKE2B 3290f0155a7b0a8cf2b9b4cccb977b33b89837fd40138be8e52157df13aaadb5844b3158f1de075ae71c8bd847e68b52df3a1f88f6eb55a8b8a891bf79b92499 SHA512 4aa12034ee6b5c59d896858688c7f37d6a756767902c2692c369c0702fde25970493894d26e73a846958ba8bb59d0c1c8a19203bff43b76ee326ae01e9485a20 +EBUILD gdal-3.9.1.ebuild 7584 BLAKE2B eaa8e4661c417b3dcb9f09755ecc7c3e95a40c1b567c28788838cd1c6ae8189fdc081de77f5c45511bfe09de3dcce2761d551635bc1f9f7e1071a2af87e44f61 SHA512 fe586db42ec13c33bbf77b67fd3383997cfb67e306bcf6e10fafa1e21c8513dac6280296042b436788fb3bc2e6fe6e69236e4d81c64b36c40807c2e3ddecf647 MISC metadata.xml 1401 BLAKE2B f76e292c72b879bf98dd9e009bdc3aabd5d1ca134d2f867a38faafa755db99b39d217b12105a184ca2ad4943704b8f1df6d129605f59485dc74114e88bfcbbed SHA512 54342a758b5d8c0b7dac325565cb7ace9ac32a6a27b621bea232ade813f9bc6b002049fb0293b7b838dd9f0ec10719ccf8f11197227acfbeddc77b4f87dc4a12 diff --git a/sci-libs/gdal/gdal-3.9.1.ebuild b/sci-libs/gdal/gdal-3.9.1.ebuild new file mode 100644 index 000000000000..8f8e1e446ead --- /dev/null +++ b/sci-libs/gdal/gdal-3.9.1.ebuild @@ -0,0 +1,286 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake java-pkg-opt-2 python-single-r1 + +DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" +HOMEPAGE="https://gdal.org/" +SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz" +SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )" + +LICENSE="BSD Info-ZIP MIT" +SLOT="0/35" # subslot is libgdal.so.<SONAME> +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + spatialite? ( sqlite ) + test? ( ${PYTHON_REQUIRED_USE} ) +" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + java? ( + >=dev-java/ant-1.10.14-r3:0 + dev-lang/swig + ) + python? ( + dev-lang/swig + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + test? ( + ${PYTHON_DEPS} + dev-cpp/gtest + ) +" +DEPEND=" + dev-libs/expat + dev-libs/json-c:= + dev-libs/libpcre2 + dev-libs/libxml2:2 + dev-libs/openssl:= + media-libs/tiff + >=sci-libs/libgeotiff-1.5.1-r1:= + >=sci-libs/proj-6.0.0:= + sys-libs/zlib[minizip(+)] + armadillo? ( sci-libs/armadillo:=[lapack] ) + curl? ( net-misc/curl ) + fits? ( sci-libs/cfitsio:= ) + geos? ( >=sci-libs/geos-3.8.0 ) + gif? ( media-libs/giflib:= ) + gml? ( >=dev-libs/xerces-c-3.1 ) + heif? ( media-libs/libheif:= ) + hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) + java? ( + >=virtual/jdk-1.8:*[-headless-awt] + ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + lzma? ( || ( + app-arch/xz-utils + app-arch/lzma + ) ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) + opencl? ( virtual/opencl ) + oracle? ( dev-db/oracle-instantclient:= ) + parquet? ( dev-libs/apache-arrow:=[dataset,parquet] ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) + spatialite? ( dev-db/spatialite ) + sqlite? ( dev-db/sqlite:3 ) + webp? ( media-libs/libwebp:= ) + xls? ( dev-libs/freexl ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND=" + ${DEPEND} + java? ( >=virtual/jre-1.8:* ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + _wstat64 # Windows LFS +) + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch +) + +pkg_setup() { + if use python || use test ; then + python-single-r1_pkg_setup + fi + + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + if use test ; then + mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_IPO=OFF + -DGDAL_USE_EXTERNAL_LIBS=ON + -DGDAL_USE_INTERNAL_LIBS=OFF + -DBUILD_TESTING=$(usex test) + + # bug #844874 and bug #845150 + -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" + + # Options here are generally off because of one of: + # - Not yet packaged dependencies + # + # - Off for autotools build and didn't want more churn by + # enabling during port to CMake. Feel free to request them + # being turned on if useful for you. + -DGDAL_USE_ARMADILLO=$(usex armadillo) + -DGDAL_USE_ARROW=OFF + -DGDAL_USE_BLOSC=OFF + -DGDAL_USE_BRUNSLI=OFF + -DGDAL_USE_CRNLIB=OFF + -DGDAL_USE_CFITSIO=$(usex fits) + -DGDAL_USE_CURL=$(usex curl) + -DGDAL_USE_CRYPTOPP=OFF + -DGDAL_USE_DEFLATE=OFF + -DGDAL_USE_ECW=OFF + -DGDAL_USE_EXPAT=ON + -DGDAL_USE_FILEGDB=OFF + -DGDAL_USE_FREEXL=$(usex xls) + -DGDAL_USE_FYBA=OFF + -DGDAL_USE_GEOTIFF=ON + -DGDAL_USE_GEOS=$(usex geos) + -DGDAL_USE_GIF=$(usex gif) + -DGDAL_USE_GTA=OFF + -DGDAL_USE_HEIF=$(usex heif) + -DGDAL_USE_HDF4=OFF + -DGDAL_USE_HDF5=$(usex hdf5) + -DGDAL_USE_HDFS=OFF + -DGDAL_USE_ICONV=ON # TODO dep + -DGDAL_USE_IDB=OFF + -DGDAL_USE_JPEG=$(usex jpeg) + + # https://gdal.org/build_hints.html#jpeg12 + # Independent of whether using system libjpeg + -DGDAL_USE_JPEG12_INTERNAL=ON + + -DGDAL_USE_JSONC=ON + -DGDAL_USE_JXL=OFF + -DGDAL_USE_KDU=OFF + -DGDAL_USE_KEA=OFF + -DGDAL_USE_LERC=OFF + -DGDAL_USE_LIBKML=OFF + -DGDAL_USE_LIBLZMA=$(usex lzma) + -DGDAL_USE_LIBXML2=ON + -DGDAL_USE_LURATECH=OFF + -DGDAL_USE_LZ4=OFF + -DGDAL_USE_MONGOCXX=OFF + -DGDAL_USE_MRSID=OFF + -DGDAL_USE_MSSQL_NCLI=OFF + -DGDAL_USE_MSSQL_ODBC=OFF + -DGDAL_USE_MYSQL=$(usex mysql) + -DGDAL_USE_NETCDF=$(usex netcdf) + -DGDAL_USE_ODBC=$(usex odbc) + -DGDAL_USE_ODBCCPP=OFF + -DGDAL_USE_OGDI=$(usex ogdi) + -DGDAL_USE_OPENCAD=OFF + -DGDAL_USE_OPENCL=$(usex opencl) + -DGDAL_USE_OPENEXR=OFF + -DGDAL_USE_OPENJPEG=$(usex jpeg2k) + -DGDAL_USE_OPENSSL=ON + -DGDAL_USE_ORACLE=$(usex oracle) + -DGDAL_USE_PARQUET=$(usex parquet) + -DGDAL_USE_PCRE2=ON + -DGDAL_USE_PDFIUM=OFF + -DGDAL_USE_PNG=$(usex png) + -DGDAL_USE_PODOFO=OFF + -DGDAL_USE_POPPLER=$(usex pdf) + -DGDAL_USE_POSTGRESQL=$(usex postgres) + -DGDAL_USE_QHULL=OFF + -DGDAL_USE_RASTERLITE2=OFF + -DGDAL_USE_RDB=OFF + -DGDAL_USE_SPATIALITE=$(usex spatialite) + -DGDAL_USE_SQLITE3=$(usex sqlite) + -DGDAL_USE_SFCGAL=OFF + -DGDAL_USE_TEIGHA=OFF + -DGDAL_USE_TIFF=ON + -DGDAL_USE_TILEDB=OFF + -DGDAL_USE_WEBP=$(usex webp) + -DGDAL_USE_XERCESC=$(usex gml) + -DGDAL_USE_ZLIB=ON + -DGDAL_USE_ZSTD=$(usex zstd) + + # Bindings + -DBUILD_PYTHON_BINDINGS=$(usex python) + -DBUILD_JAVA_BINDINGS=$(usex java) + # bug #845369 + -DBUILD_CSHARP_BINDINGS=OFF + + # Check work/gdal-3.5.0_build/CMakeCache.txt after configure + # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71 + # Commented out: not (yet?) implemented upstream. + # Also, arm64 stuff is a TODO upstream, but not there (yet?) + -Dtest_avx=$(usex cpu_flags_x86_avx) + -Dtest_avx2=$(usex cpu_flags_x86_avx2) + -Dtest_sse=$(usex cpu_flags_x86_sse) + -Dtest_sse2=$(usex cpu_flags_x86_sse2) + #-Dtest_sse3=$(usex cpu_flags_x86_sse3) + -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1) + #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2) + #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a) + -Dtest_ssse3=$(usex cpu_flags_x86_ssse3) + #-Dtest_fma4=$(usex cpu_flags_x86_fma4) + #-Dtest_xop=$(usex cpu_flags_x86_xop) + ) + + if use test ; then + mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile doc +} + +src_test() { + export GDAL_RUN_SLOW_TESTS=0 + export GDAL_DOWNLOAD_TEST_DATA=0 + + # Two test suites: + # 1. autotests (much larger, uses pytest) + # 2. Small set of fuzzing tests (no download needed) + + # Missing file for test-unit? + cmake_src_test -E "(test-unit)" +} + +src_install() { + cmake_src_install + use python && python_optimize + + if use java; then + # Move the native library into the proper place for Gentoo. The + # library in ${D} has already had its RPATH fixed, so we use it + # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. + java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + rm -rf "${ED}/usr/$(get_libdir)/jni" || die + fi + + # TODO: install docs? +} + +pkg_postinst() { + elog "Check available image and data formats after building with" + elog "gdalinfo and ogrinfo (using the --formats switch)." + + if use java; then + elog + elog "To use the Java bindings, you need to pass the following to java:" + elog " -Djava.library.path=$(java-config -i gdal)" + fi +} diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 38a4b78b01a9..b6ab256a89d6 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -9,5 +9,5 @@ EBUILD geos-3.11.0.ebuild 935 BLAKE2B a054f82c6d3e44245c0ba284e3134dcbbe139ae2a6 EBUILD geos-3.11.1.ebuild 986 BLAKE2B f6956a71348a995d08bf40be451c341b0403cbb81499aa447e9929a1e1417ed2dcca293ba78915fd2097b1528273224b7abcd0cb516820150c14af664a78cc7f SHA512 e23f87064e8336ea774dab0af267500d6263c5641d10ef0e86dc97b0e9ff57d30e8ed8701aba19b992f10ff78803a244de1c3c41405001889a6573b734aa1f90 EBUILD geos-3.11.2.ebuild 1101 BLAKE2B 83257453288cc6420aed5bf1d9559351175841b1d3748fac3132b511d2a92041ae06d66d36d5beb55f995561a1c6e56e71095ae62df1d6260f4ecb49227dfe64 SHA512 396911db1b815fe83a4176fcdac0b64d46345116bee84d539a18f4382f9fbcd45975b5b42be45eda40017421612a978c7483cbf26a7aeae67bf08684ec8532c4 EBUILD geos-3.12.0.ebuild 1059 BLAKE2B 69f2ca6137771ef8fdb3bc41476fefd0a0fda8306e7c14aad4b3d2957787dfadb1a23678cd0145143ac2db0db087310c4a099eb6db67d8ddf50f6ccdb080684e SHA512 bb3f4b542f7f673844823052ede3b42c0d3f8dd94b557adf8713dc35e6636554dae00fbaba19fcd71795cb053d0b0974c998bdb2d5211165547da11377670101 -EBUILD geos-3.12.1.ebuild 1059 BLAKE2B 69f2ca6137771ef8fdb3bc41476fefd0a0fda8306e7c14aad4b3d2957787dfadb1a23678cd0145143ac2db0db087310c4a099eb6db67d8ddf50f6ccdb080684e SHA512 bb3f4b542f7f673844823052ede3b42c0d3f8dd94b557adf8713dc35e6636554dae00fbaba19fcd71795cb053d0b0974c998bdb2d5211165547da11377670101 +EBUILD geos-3.12.1.ebuild 1054 BLAKE2B ae3e509c4b8ee5953943032bc9bed757f8f54eb45bc8c441f74c28b2014bca77b1ec322a29e13fd85ef21113c3c5181fe049180cce3b65c15c97b5698c770f6c SHA512 039d74a02558919169248880741d06b673b6937acbfa9b46b07ec221e59db278133dad39ca64173647b412ec91eeb70700db8ca9c29ffab75461c23ae1dc9fcf MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452 diff --git a/sci-libs/geos/geos-3.12.1.ebuild b/sci-libs/geos/geos-3.12.1.ebuild index 71105c249023..a92d85418e1e 100644 --- a/sci-libs/geos/geos-3.12.1.ebuild +++ b/sci-libs/geos/geos-3.12.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest index f817a18c8c0e..691c3bc4d6a1 100644 --- a/sci-libs/ginkgo/Manifest +++ b/sci-libs/ginkgo/Manifest @@ -4,7 +4,7 @@ AUX ginkgo-1.8.0-disable_automagic_dependencies.patch 784 BLAKE2B 30ae35f0adec6a DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 DIST ginkgo-1.6.0.tar.gz 12788830 BLAKE2B c452e20eddb3673b5863106d8a8d42aab253cb5a17cf0445194903ebadcffe53ef0df6b5f26e2602e137faaa4a23dddd0b192f3453b4bd440907385fc09d004a SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50 DIST ginkgo-1.8.0.tar.gz 13140660 BLAKE2B 4b1800566ec2852b3dd7e58b01ec58e2cab45b55134fdf3d478832435c40b45320dc066d281a07127d1fc42e57c6f3d99440209d2286adc1294e44a1f660ad36 SHA512 9d121a5eec9f5d17d1bd4b8924ebb32985a68e8087addc7385b619e365ed260a40ab73eb7a8a16f46a590d3162a78c9311ff41dd3dc74a9117a61e0445d96c52 -EBUILD ginkgo-1.4.0-r3.ebuild 1267 BLAKE2B 509ac83701e30924c09f1ff6b4c56e6c2ebebec69e8debc96fbaafa3110a6cc81437f81ad20d77ef7b9cf6341be87e82bcea20fd0191b6baf5c8f32909eca037 SHA512 1801ec71a30814acd8e521e313a722ce472edffb20d10cd627093360ab62b9ee10d09e27dd4ffdeff0bd8f153e636d9fad45268a262e1619d3def6cd952e7965 -EBUILD ginkgo-1.6.0.ebuild 1381 BLAKE2B 303537467c4e8e92c0c0bc92d327eed70174486ed27c01ddc879557c619a0bb9cae4ef252736ac99cc597df3ee1ad98804d5e122b9690fa808b5307a7b46c978 SHA512 c79400621aa3b8db866017e8814d85a9107fe10e7ae620238227216b7baee16bc38e6540d7d907879c1c249b7afb6bd40fd13d58e9312fc391e1884e95e52d58 -EBUILD ginkgo-1.8.0.ebuild 1337 BLAKE2B 57a133ffa7187422448f9d44923a51592f37e18cce870810224e92eae165983e03e4b2c7d91e7dfc10577b336c3d833edef1f4db726edecc64ad2e251bcd4c52 SHA512 34a3467578595494834097d89d7cb7f4b4d02ffa2cbec1d86dd996df17a0f1eddefed3a409d6e2d7f846b6a2dd12fea3e4c91a419ebc398a6ab328d4f640d6f7 +EBUILD ginkgo-1.4.0-r3.ebuild 1309 BLAKE2B 8936697638a5b469146128bc8feff5ec68a373970ee7590dab160e9dbc45f344355b6a925fece27619b13c8ed73bc7a0934686343052897136adbc4c29f0be4a SHA512 8f72990eec34f0b916994086328f72ec3bb5c96ffaa307569bc459c6fb9a945331221005e1b4af125f6e5728c43100fd234c2e624cc5328dc753b2fbac393c87 +EBUILD ginkgo-1.6.0.ebuild 1423 BLAKE2B 0af51aca71d86f7daf683b27858f1478af5783403730b936026e83fea23599deca195f97fed110486d9539ce498909e945db2401ca7c940299a453582028e787 SHA512 2c63ea02cab0e157bf7e96b99a2b28b712bd510c72d6ad60541c3dbdee63a6f95c6bcc41a88de82a52230d52fc14468ccb57bff9b671e1536a2271c85d81dbbc +EBUILD ginkgo-1.8.0.ebuild 1379 BLAKE2B 85e487eb78a3034988d8a94cecf31849858ec2ea3fada99c1c5e53dea4e2c41f4425ed524092677120f39f8f65be3956ac696c6fa5816512b749105b7e9b765e SHA512 fcf98f693cc9b86f2fd473b462608579b3188a136b26ad7cf438f472e4a057f9cb330d55709d7cfc03079203d259fa3dc48c396f39465681557c861e40d42385 MISC metadata.xml 892 BLAKE2B cedbb29c9e43c4b94baff1c5c7f657e9120792fe5faf0b4dab621b17579c6c82ccc3c07ee216bf45cc83b12d44fdcedaaf0736b56611b6abcb114224c2070856 SHA512 2051aabc0746015724bb7bf3f9be42097990b5a7d2657f51f8ed448e2b7f8f6ac27be208d33f133bf1098f2785b4b1b6eac27244e05337e4b80ffdfda10ec664 diff --git a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild index abd270c911c4..0a4e3d5aea71 100644 --- a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild +++ b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Numerical linear algebra software package" HOMEPAGE="https://ginkgo-project.github.io/" @@ -34,16 +34,15 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -src_prepare() { - sed -i \ - -e "s#\"lib\"#\"$(get_libdir)\"#g" \ - -e "s#\"lib/#\"$(get_libdir)/#g" \ - cmake/install_helpers.cmake || die "sed failed" - - cmake_src_prepare -} - src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862705 + # https://github.com/ginkgo-project/ginkgo/issues/1657 + # + # Do not trust it with LTO either. + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_BUILD_TESTS=OFF diff --git a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild index 4cceeb06c5b6..c08e881a46e3 100644 --- a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild +++ b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Numerical linear algebra software package" HOMEPAGE="https://ginkgo-project.github.io/" @@ -39,16 +39,15 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -src_prepare() { - sed -i \ - -e "s#\"lib\"#\"$(get_libdir)\"#g" \ - -e "s#\"lib/#\"$(get_libdir)/#g" \ - cmake/install_helpers.cmake || die "sed failed" - - cmake_src_prepare -} - src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862705 + # https://github.com/ginkgo-project/ginkgo/issues/1657 + # + # Do not trust it with LTO either. + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_BUILD_TESTS=OFF diff --git a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild index 5b507b79f030..028c8cdc3a77 100644 --- a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild +++ b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Numerical linear algebra software package" HOMEPAGE="https://ginkgo-project.github.io/" @@ -38,16 +38,15 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -src_prepare() { - sed -i \ - -e "s#\"lib\"#\"$(get_libdir)\"#g" \ - -e "s#\"lib/#\"$(get_libdir)/#g" \ - cmake/install_helpers.cmake || die "sed failed" - - cmake_src_prepare -} - src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862705 + # https://github.com/ginkgo-project/ginkgo/issues/1657 + # + # Do not trust it with LTO either. + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_BUILD_TESTS=OFF diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest index cb9545f67f1d..21dd6b3359f9 100644 --- a/sci-libs/givaro/Manifest +++ b/sci-libs/givaro/Manifest @@ -1,11 +1,7 @@ AUX givaro-4.1.1-fix-pc-libdir.patch 549 BLAKE2B f564256b81f1e2ef42bca171fce581e603887905dcf7fe8c881e59aae82d062767efdb096598f92bca09e9127c98fe023e9c034b5b38ef4ca575da9e877ca334 SHA512 927b1a15c834ba2c1cab37e1fdac1ab1c347cba7aba98be652e2ed4468d2a0627cc7f4820561655d1a223c02f8eaba7cc2911acb9998fc853dc20590fb1c74ef -AUX givaro-4.1.1-gcc-10.patch 1035 BLAKE2B 460371ff8e628e1945a29d9c6d2b718c7d98b07b023540bc49a439cd941a19191db44536a1514495014084a85028debfb4e714d6d9efd9ae7c7c12687d5f8400 SHA512 3e154b3cf6c11a106f78778eeaaf0c2cfe81e25d18f623b5b071b306f1221c8513f27f87ab3e3684a8b3f18138dfbb516c33691dbb854072a35a0be21ac0bc48 -AUX givaro-4.1.1-gcc-13.patch 667 BLAKE2B d51ce9ce832d6d3e31410207bd77d3efa56e87a3a3c0cebb4dd16387a41647f59f5e6cd768b763909c54e2de06ed73ed0cc3dd8be0eb4809d6a77ecf201eafdf SHA512 e414c98aea642b705cf692c06371512713d1a8210cebfbfe80d26d48a18d6fb42726a6d9cf161390b66c7b424965fc3280ca2811b13a20b1fd986f346e3ae6df AUX givaro-4.2.0-configure.ac-fix-a-bashism.patch 916 BLAKE2B 00681f62b334b248ef783980c18ddc7d72c24e5a3c0f3fa4d4889bfe874b88085a6b8caf38220d9b078b90bf69bd620cceacf6a0e422eccdb0a76a32d38f71c5 SHA512 af63e7cd74e920436e3e96029d6f4981a6019bffa5ebf146da763688d41c210ac9fcdc29805a6e52b5977d81fda5e6b377d1dc137c71da4e2c84fa66d93756e2 AUX givaro-4.2.0-cstdint.patch 1319 BLAKE2B f8e742aadb65c075b419921431c21ffe06964aa6c9685da901022c4d36a71e785ca91c76fbef2eaaee35daedd49679e289af898d44c68760721a4a9d696e60ff SHA512 bbf9e473f853f72f8863cf271eec39e102ce917abf7d5eae256b62781616dbc927caa373224d4bb0f0cc014335c6219a6aea782072af9089edd1a5ef22e17c31 AUX givaro-4.2.0-gcc14.patch 1062 BLAKE2B 76904d16f406f0486e99dfaa096a9da3d7f049947ef530d88efc294e801a6f54daa02f7ffe23ef54ebcf7bd2420069d0718ff3bde4de4a52ca4ab4aebca2ab1a SHA512 f9e9fa458d4e304402a674b6880295993640b1673bf4e95c79c917dc22caf6dc1d91cec6dc01863893c21b0950356323be7dcbd80c522b45f0302967e8308771 -DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c DIST givaro-4.2.0.tar.gz 969595 BLAKE2B 07c9f08269ee60c06b1589e56ccf61870df6c7cab93fb8ebf27791d9231b153a2da9aed296105fd6dcd52aaa7d27ea03eacd6f2066d29de267455c9ca3747995 SHA512 1a3280563181710d364b77e1efe8c8f52ce3119a08b35f329cfd98136a742431b7e9d102289448d337797f815439682d0cfce1567a5a88d5851b244673a84486 -EBUILD givaro-4.1.1-r3.ebuild 1942 BLAKE2B 4de01c80280c1f35dd9ef8e48290cf7589ec342454a13d954150330dee4eb061a0f86ef1b8349138984256eaa5c982eb19c0fce499cfb549b8b97a47a69872e7 SHA512 caab6a64842b31f3286152d2ed59457088955e67ae7156d207cc05ca731d7a67440e4cc4bcce889fb35376fdeaf7d918987c62126352c539d3c293f85ab80eae EBUILD givaro-4.2.0.ebuild 1204 BLAKE2B af8cba5c622d9c48f706cf06e817a2b3ed1799b3d83d3d91bfc4e5e6822e8bdebbe06dc365a34f85f8620d2fa38759d1f9346b9fecebb49df2fe2def52cf4a91 SHA512 dd191d8978ef002e2e1508222c6c66161af889530e723de168c87ad2c091b4a015005782a6a5a02c7d87b641ca71862fdaa93eff6ea2121f255edc392b9b1838 MISC metadata.xml 769 BLAKE2B b407b31de2f554fdf554b2d77c2dd0b1bbf39f36b29fdf565f50362153798c60bcfecf0411247eec556ff6ddc92af0c49e11a9b242b5e3e7b7dcc1066527d08c SHA512 063ccc3fcd55f3d7033fd23efe5095d83784d0e60cca2e1092e534fe06d0e69d5d340a0a25547bddc2962d2906c14a2c996852e2c198124ed007ecdfde4fff2e diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch deleted file mode 100644 index 0564c7f94fef..000000000000 --- a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5ba9fa4930b347aea8817da444bea5a88971079a Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sat, 7 Aug 2021 11:43:29 -0400 -Subject: [PATCH 1/1] configure: hack out old GCC-4.x test. - -The Givaro ./configure script fails to detect modern versions of GCC, -instead deciding that they must be gcc-4.8. As a result, we wind up -with "-fabi-version=6" in CXXFLAGS, which then gets propagated to -users of "givaro-config --cflags", like fflas-ffpack. - -This is already fixed upstream, but not in a release, and not in a -way that I care to backport. Here we just hack the configure script -directly since the change is so trivial. ---- - configure | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure b/configure -index 1eb75b0..f3bbb52 100755 ---- a/configure -+++ b/configure -@@ -17172,11 +17172,6 @@ fi - - echo "-----------------------------------------------" - --if test "x$CCNAM" = "xgcc48"; then : -- REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6" --fi -- -- - - # Machine characteristics - --- -2.31.1 - diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch deleted file mode 100644 index 15178289ca84..000000000000 --- a/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c7744bb133496cd7ac04688f345646d505e1bf52 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" <code@musicinmybrain.net> -Date: Thu, 19 Jan 2023 09:12:22 -0500 -Subject: [PATCH] Add missing #include <cstdint> for (u)int64_t - -Fixes failure to compile on GCC 13. ---- - src/library/poly1/givdegree.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/library/poly1/givdegree.h b/src/library/poly1/givdegree.h -index 3753a425..eb85a0dd 100644 ---- a/src/library/poly1/givdegree.h -+++ b/src/library/poly1/givdegree.h -@@ -19,6 +19,8 @@ - #ifndef __GIVARO_poly1degree_H - #define __GIVARO_poly1degree_H - -+#include <cstdint> -+ - #include <iostream> - - namespace Givaro { diff --git a/sci-libs/givaro/givaro-4.1.1-r3.ebuild b/sci-libs/givaro/givaro-4.1.1-r3.ebuild deleted file mode 100644 index e6da3ebb6eaa..000000000000 --- a/sci-libs/givaro/givaro-4.1.1-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="C++ library for arithmetic and algebraic computations" -HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/" -SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="CeCILL-B" -SLOT="0/9" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( - app-text/doxygen[dot] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -DEPEND="dev-libs/gmp:0[cxx(+)]" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog README.md ) - -PATCHES=( - "${FILESDIR}/givaro-4.1.1-gcc-10.patch" - "${FILESDIR}/givaro-4.1.1-gcc-13.patch" - "${FILESDIR}/givaro-4.1.1-fix-pc-libdir.patch" -) - -src_configure() { - # Passing "--disable-doc" also accidentally enables building - # the documentation, so we can't just $(use_enable doc) here. - # https://github.com/linbox-team/givaro/issues/148 - econf \ - $(usex doc --enable-doc "" "" "") \ - --with-docdir="/usr/share/doc/${PF}/html" \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index 306fb6709bbe..330e8eedaec8 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -2,6 +2,6 @@ AUX gsl-2.7.1-configure-clang16.patch 806 BLAKE2B 5b3552d9ad70de9100a77cdf822fc6 AUX gsl-2.7.1-test-tolerance.patch 1700 BLAKE2B 5964fe42d8238dbb4d508f5bdce6246311d403fcbdaf44c1f691e94d26cdfb8e8370df5f9fb2ae5a4b212f67954c553a089020e9846cced321ba8b1157182a84 SHA512 9acaf4690418e0dd87ced481d696f1034d74b09d851241ac21895740330dd8f3d237f0526476923af7f7d9fb852c09f0c64d78f98b277fd134d0ac2bf34b8afd DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 -EBUILD gsl-2.7.1-r2.ebuild 1348 BLAKE2B 4a22ec3920aa67b3bdabf0ccba5d7bda8a3d99bdebe5a0888c644d282ce34096d26a159dfec002b0758d4887cff44ba9d2be2d00f5d616418ee521b5e0d80445 SHA512 d11fc8e417cbccc36d48c7460cb8331e74dba8cefa31495ca95bea13939569925f3536a6feb4e17bf35f1c5ddd04ac1b608cadf489624c190af7fb31526026cf -EBUILD gsl-2.7.1-r3.ebuild 1403 BLAKE2B aadafa4820e042c9267291be517eda6367fa7be97e84b84b7c1fd21af9aa3f53ff6e009982858cd7f189ab98c4319ca8df965d9f8ebcf8f2909c74b0194def68 SHA512 b1b4e516c49fef9249843ac85546fe83c0a9492c0a3e3240bf538a3b2f41a83ee730a533a29a3668ee8113161012f8d1ffc87a6ceaa0b2fcbacade8fdcd06b40 +EBUILD gsl-2.7.1-r2.ebuild 1467 BLAKE2B d7b73dfc183cddeeadbf0c61ebc6976f64bd605795762f213367d6fe584fc3c4da4664857c4253c2ff12a46e4cbbe36569b47cca24b5497113a43c7c5cb0f780 SHA512 55cf47befd8f6d1d57fa0e87b7c28021621e9cb2b275deeb035084c692eea89bdb6e025f4b2e08403a782627e87f94fda6fcd4d19fde055f4ca9c0cf3b4c161e +EBUILD gsl-2.7.1-r3.ebuild 1522 BLAKE2B ed3eed60f8a658b1c9108660530836887e3394f171b24057aba98a3053fd77c1ea382dd3dab28bc7387441ad3bd97209f40113c3156f81a1b0196c7e40a1209b SHA512 6e53def8d071726f1481ee5e112d69776a66ae3f4d97703fc8f773821016872df1093e4be404b437043efe888261170f50bf7efda37aa88ef038fc791c4e9480 MISC metadata.xml 1339 BLAKE2B 65c2b4eb597ccc4fe4ffb92d37e5800af6f9136fb3186bef0167d52584565faca0778ef775c0e736508cdf8eb480d26bc9a74dc799f37ff6fcd2131410f1660c SHA512 f8201bb6adb83ba875315a2201a97e1653d08665f5889d3fde83cb7ff196ae9f904372552d980b5e3c210e5aa855915827c1af32255539cab236e2b938d39888 diff --git a/sci-libs/gsl/gsl-2.7.1-r2.ebuild b/sci-libs/gsl/gsl-2.7.1-r2.ebuild index 62c11d0d8578..ddc7239a72ce 100644 --- a/sci-libs/gsl/gsl-2.7.1-r2.ebuild +++ b/sci-libs/gsl/gsl-2.7.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,6 +36,12 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927585 + # + # Testsuite issue. Seems fixed in 2.8. + filter-lto + filter-flags -ffast-math if use cblas-external; then diff --git a/sci-libs/gsl/gsl-2.7.1-r3.ebuild b/sci-libs/gsl/gsl-2.7.1-r3.ebuild index 81205249e873..e3b8d92fe484 100644 --- a/sci-libs/gsl/gsl-2.7.1-r3.ebuild +++ b/sci-libs/gsl/gsl-2.7.1-r3.ebuild @@ -37,6 +37,12 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927585 + # + # Testsuite issue. Seems fixed in 2.8. + filter-lto + filter-flags -ffast-math if use cblas-external; then diff --git a/sci-libs/h5hut/Manifest b/sci-libs/h5hut/Manifest deleted file mode 100644 index 92e352ab909d..000000000000 --- a/sci-libs/h5hut/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX h5hut-1.99.13-autotools.patch 2809 BLAKE2B de8b47ec4dd418cd3c6e5c7670c11fb913c40d92a6ad9dbd75125443e5e827fecb4d21b5551f69355c5da6acb2159a095f448c2e063ac5014138de3321b830f8 SHA512 05200ef8073c1c39e322015e9d4b9764c470336f704c8f86e056d1936de669f256c64baf94307d84f4574d1204f914abffa9b134942e354f474c51dc0b78c05c -AUX h5hut-1.99.13-mpio.patch 574 BLAKE2B 063729a01cd992fab481871210e0f6c63f2b93cd8f41e7ee11d84e2572e46945b1934a52514376700c4f4e25b142279591698f53067b9398f1290113be5e3399 SHA512 9335f2d84c4353123e1c1af5f82a729322cacd6f0bfa95ccbe042b76693f035c5b2860d788d31063299e3705addd6160b4b985be88beba341bee56a397387919 -DIST H5hut-1.99.13.tar.gz 3029357 BLAKE2B 555d1f89ff60fbd72763026643ae76d5f68bb9d76bfd2fb29d846e3c777184db3be1bae98763ae683e72566e2624678118eea0da8d0bc1e57b84fd0b4777abe7 SHA512 c2590795c45ecf5e642308f5b36c4e573fdcbb6e985f5867c13fd9e1f0ddd9b48fbc423ad0165b8f047256e42a1eb54d508c9322a593bcfad3a2769547d2887a -EBUILD h5hut-1.99.13-r1.ebuild 790 BLAKE2B 09575e246784c9824cf00cc85660544a9c6edfe280677bdaae9531491a793e0af2e2dfdfc146dd90417a32d1c7c60dfbea4af05d2c469db8625b7428446dd558 SHA512 5541f0e4b059dfb8e77b0aface99028545b5e89459784186de315fd3b4866c9021ece71f6df28ba83ca1168a6aa8aa9eb23c95f8e24064d02edb528085a469f5 -MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368 diff --git a/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch b/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch deleted file mode 100644 index 262aa61461a3..000000000000 --- a/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Naur H5hut-1.99.13.orig/src/Fortran/Makefile.am H5hut-1.99.13/src/Fortran/Makefile.am ---- H5hut-1.99.13.orig/src/Fortran/Makefile.am 2017-07-02 16:46:44.899690038 -0600 -+++ H5hut-1.99.13/src/Fortran/Makefile.am 2017-07-02 16:53:46.414587073 -0600 -@@ -49,9 +49,6 @@ - awk '/INTEGER\*8 :: /{print "\t" $$0}' $^ >$@ - awk '/PARAMETER /{print "\t" $$0}' $^ >> $@ - awk '/INTEGER\*8 FUNCTION/{print "\t" $$1 " " $$3}' $^ >>$@ -- --all-local: $(top_srcdir)/src/include/H5hutF.h -- $(INSTALL) -m644 .libs/libH5hutF.a $(top_srcdir)/src/lib - endif - - clean: clean-am -diff -Naur H5hut-1.99.13.orig/src/h5core/Makefile.am H5hut-1.99.13/src/h5core/Makefile.am ---- H5hut-1.99.13.orig/src/h5core/Makefile.am 2017-07-02 16:46:44.899690038 -0600 -+++ H5hut-1.99.13/src/h5core/Makefile.am 2017-07-02 16:58:03.017839542 -0600 -@@ -89,15 +89,10 @@ - - libH5hut_la_LDFLAGS = -version-info 2:0:0 - --all-local: -- $(INSTALL) -m0755 -d $(top_builddir)/src/lib -- $(INSTALL) -m644 .libs/libH5hut.a $(top_builddir)/src/lib -- - install-exec-local: - @$(INSTALL) -d $(DESTDIR)$(includedir)/h5core - @$(INSTALL) -m644 $(top_srcdir)/src/include/h5core/*.h $(DESTDIR)$(includedir)/h5core/ - - clean-local: -- $(RM) -f $(top_srcdir)/src/lib/libH5hut.* - $(RM) -f *~ - -diff -Naur H5hut-1.99.13.orig/test/Makefile.am H5hut-1.99.13/test/Makefile.am ---- H5hut-1.99.13.orig/test/Makefile.am 2017-07-02 16:46:44.919690283 -0600 -+++ H5hut-1.99.13/test/Makefile.am 2017-07-02 16:58:01.297818301 -0600 -@@ -1,10 +1,9 @@ - # test level Makefile.am - - AM_CPPFLAGS += -I$(top_srcdir)/src/include --AM_LDFLAGS += -L${abs_top_builddir}/src/lib - - LDADD = --LDADD += -lH5hut -+LDADD += ../src/h5core/libH5hut.la - - noinst_PROGRAMS = - -diff -Naur H5hut-1.99.13.orig/tools/Makefile.am H5hut-1.99.13/tools/Makefile.am ---- H5hut-1.99.13.orig/tools/Makefile.am 2017-07-02 16:46:44.919690283 -0600 -+++ H5hut-1.99.13/tools/Makefile.am 2017-07-02 16:59:30.228916458 -0600 -@@ -8,10 +8,9 @@ - - AM_CPPFLAGS += -I${abs_top_builddir}/src/include -Wno-deprecated - FFLAGS += -cpp $(AM_CPPFLAGS) --AM_LDFLAGS += -L${abs_top_builddir}/src/lib - - LDADD = --LDADD += -lH5hut -+LDADD += ../src/h5core/libH5hut.la - - if ENABLE_C - EXTRA_SCRIPTS = # h5hutcc -diff -Naur H5hut-1.99.13.orig/tools/vtk2h5grid/Makefile.am H5hut-1.99.13/tools/vtk2h5grid/Makefile.am ---- H5hut-1.99.13.orig/tools/vtk2h5grid/Makefile.am 2017-07-02 16:46:44.919690283 -0600 -+++ H5hut-1.99.13/tools/vtk2h5grid/Makefile.am 2017-07-02 16:58:58.978530564 -0600 -@@ -1,10 +1,9 @@ - AM_CPPFLAGS = -I${abs_top_srcdir}/src/include -Wno-deprecated - FFLAGS += -cpp $(AM_CPPFLAGS) --LDFLAGS += -L${abs_top_builddir}/src/lib - - LDADD = - --LDADD += -lH5hut -lvtkIO -lvtkFiltering -lvtkCommon -lvtksys -lpthread -ldl -+LDADD += ../src/h5core/libH5hut.la -lvtkIO -lvtkFiltering -lvtkCommon -lvtksys -lpthread -ldl - - - bin_PROGRAMS = diff --git a/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch b/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch deleted file mode 100644 index a94c8e59000f..000000000000 --- a/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur H5hut-1.99.13.orig/src/h5core/h5_hdf5_private.h H5hut-1.99.13/src/h5core/h5_hdf5_private.h ---- H5hut-1.99.13.orig/src/h5core/h5_hdf5_private.h 2017-07-02 16:46:44.899690038 -0600 -+++ H5hut-1.99.13/src/h5core/h5_hdf5_private.h 2017-07-02 16:47:16.550080867 -0600 -@@ -934,7 +934,7 @@ - HDF5_WRAPPER_ENTER (h5_err_t, - "fapl_id=%d, comm=..., use_gpfs=%d", - fapl_id, (int)use_gpfs); -- if ( H5Pset_fapl_mpiposix (fapl_id, comm, use_gpfs) < 0) -+ if ( H5Pset_fapl_mpio (fapl_id, comm, use_gpfs) < 0) - HDF5_WRAPPER_LEAVE ( - h5_error ( - H5_ERR_HDF5, diff --git a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild deleted file mode 100644 index 8401f6468846..000000000000 --- a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MY_P="${P^h}" -DESCRIPTION="High-Performance I/O Library for Particle-based Simulations" -HOMEPAGE="http://www-vis.lbl.gov/Research/H5hut/" -SRC_URI="https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# < dep on hdf5 because of bug #809221 -# Needs a proper fix. -DEPEND=" - virtual/mpi - <sci-libs/hdf5-1.12[mpi] - " -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-mpio.patch" - "${FILESDIR}/${P}-autotools.patch" - ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx -} diff --git a/sci-libs/h5hut/metadata.xml b/sci-libs/h5hut/metadata.xml deleted file mode 100644 index c0cd18916a93..000000000000 --- a/sci-libs/h5hut/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/h5part/Manifest b/sci-libs/h5part/Manifest deleted file mode 100644 index 7048091e4994..000000000000 --- a/sci-libs/h5part/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX h5part-1.6.6-mpio.patch 948 BLAKE2B fb85c4cb0457a7f65212592c26ed1aeb8e917a9ebb4dbc8904c269bef6a8bc91f87e655de4a5f3e728d888bcd2526007de0cb10fab360cd079cd97a2e58e6834 SHA512 41ae0a9b9f2ae84b29133879136b392cf58c68ab75195179c7b95600bc693b3f6d2ab74533285a3727590f5aac61db2d9f4c9c732720fba15164fea8f29e7a34 -DIST H5Part-1.6.6.tar.gz 441755 BLAKE2B bc0027a91cc5f28009dc1b716fe548c670307ca19782158314d3358e66091608cf81149dece1fddf4f279aa920b06930019a26c5f34e4e3ce58df80d003ff5e6 SHA512 0842017bfe1510746e6f9451daaaaff3d9f6eee5209e241bcc8f2d0ce96450b8929f718c41a3434f53c9457adc2547628ad57ac8a0fb1cbfb7c74862aebf996d -EBUILD h5part-1.6.6-r1.ebuild 634 BLAKE2B c04b03ce27c26929d74694c88a5214a77ccf518287bd3d434a4e04f9039d2159c1cdfb99b5cb0592d600e10f4f2e318e1700c84cc4f050796c9dc84bfcfea58b SHA512 43a36c0c487ff845665a5ebc48458044ff8732ee32c662627d24f7a0706557c82111e1b7241c508dbd596ffab68828c42706a92e278e52294e4342a03bc49d4b -MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368 diff --git a/sci-libs/h5part/files/h5part-1.6.6-mpio.patch b/sci-libs/h5part/files/h5part-1.6.6-mpio.patch deleted file mode 100644 index 152cfec34985..000000000000 --- a/sci-libs/h5part/files/h5part-1.6.6-mpio.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/quinoacomputing/H5Part/commit/b8b106c368c3400b4df3d38e97ae2943d37d3c7d.patch - -From b8b106c368c3400b4df3d38e97ae2943d37d3c7d Mon Sep 17 00:00:00 2001 -From: Jozsef Bakosi <jbakosi@lanl.gov> -Date: Thu, 28 Jul 2016 08:37:24 -0600 -Subject: [PATCH] Replace H5Pset_fapl_mpiposix with H5Pset_fapl_mpio - -Based on the advice at -http://www.unidata.ucar.edu/mailing_lists/archives/netcdfgroup/2014/msg00188.html. ---- - src/H5Part.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/H5Part.c b/src/H5Part.c -index 433a574..8a1b893 100644 ---- a/src/H5Part.c -+++ b/src/H5Part.c -@@ -246,7 +246,7 @@ _H5Part_open_file ( - /* select the HDF5 VFD */ - if (flags & H5PART_VFD_MPIPOSIX) { - _H5Part_print_info ( "Selecting MPI-POSIX VFD" ); -- if (H5Pset_fapl_mpiposix ( f->access_prop, comm, 0 ) < 0) { -+ if (H5Pset_fapl_mpio ( f->access_prop, comm, 0 ) < 0) { - HANDLE_H5P_SET_FAPL_ERR; - goto error_cleanup; - } diff --git a/sci-libs/h5part/h5part-1.6.6-r1.ebuild b/sci-libs/h5part/h5part-1.6.6-r1.ebuild deleted file mode 100644 index 388a4fe89c55..000000000000 --- a/sci-libs/h5part/h5part-1.6.6-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${P^^[hp]}" -DESCRIPTION="Portable High Performance Parallel Data Interface to HDF5" -HOMEPAGE="https://vis.lbl.gov/archive/Research/H5Part/" -SRC_URI="https://codeforge.lbl.gov/frs/download.php/latestfile/18/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - virtual/mpi - sci-libs/hdf5:=[mpi] -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-mpio.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx -} diff --git a/sci-libs/h5part/metadata.xml b/sci-libs/h5part/metadata.xml deleted file mode 100644 index c0cd18916a93..000000000000 --- a/sci-libs/h5part/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest index 549616234f28..d85bc1755ee8 100644 --- a/sci-libs/ignition-math/Manifest +++ b/sci-libs/ignition-math/Manifest @@ -1,5 +1,3 @@ -DIST ignition-math6_6.14.0.tar.gz 628564 BLAKE2B 6206f1f35472bf51a8a3bdb8fae26d9879044ea856abd8bcce2cfb5bf16d2638816b3fff7e451c165fec8b2ba82db083d78306d5441c4db3def14b08ddad7556 SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802 DIST ignition-math6_6.15.1.tar.gz 632975 BLAKE2B 94a300b56a74a0c44da9ec74861fce7946e50d5a16bd56b383bfbd63e9d6f285bd803da6528d899711b74002cce1a8c95cc7c82580aa391794dd0d9fd63ae96f SHA512 569fb37be4b42f170189de680beb71c6274e2a48d02f77d6a9d675ca9901be32df7af6b86f69916ff96b4f7065f8f1d4a9fb3ef81c2b7f5fc3f325e17279edba -EBUILD ignition-math-6.14.0.ebuild 602 BLAKE2B 652f682ff71254785da587999a2ffaad4a07129c557fa40f9be0d4a4a405c1dbd4bae2826d2d265e16c4c9e4c543700a4d014b032aea5ad2d85532b37817c826 SHA512 06e90b5c83ba8e10f45df3817f4f81ea0223fad79cd6e9a9a62b89b500e677756148013bf6b929df70c23da9ae01dcb0696023e50819d59d59b376b55bb4caa5 EBUILD ignition-math-6.15.1.ebuild 602 BLAKE2B 652f682ff71254785da587999a2ffaad4a07129c557fa40f9be0d4a4a405c1dbd4bae2826d2d265e16c4c9e4c543700a4d014b032aea5ad2d85532b37817c826 SHA512 06e90b5c83ba8e10f45df3817f4f81ea0223fad79cd6e9a9a62b89b500e677756148013bf6b929df70c23da9ae01dcb0696023e50819d59d59b376b55bb4caa5 MISC metadata.xml 343 BLAKE2B bb5108d0bcc5fe3831a10464432ac25c55c222e552e3c263e03f0a31e506c1de87343bfa99e88eca81f4b46c5ce49439c72b2272d4fdeb86183dff93d9420cb3 SHA512 b15e2a7b1584b98b9611ec8e75846e58fcba9e3f93547f473b43328499ca47695a1d1430ad0e77c319d40c50eccddfeed36771710b794d1116fa0d15e530e386 diff --git a/sci-libs/ignition-math/ignition-math-6.14.0.ebuild b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild deleted file mode 100644 index eb0f9750bfd7..000000000000 --- a/sci-libs/ignition-math/ignition-math-6.14.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=RelWithDebInfo -inherit cmake vcs-snapshot - -DESCRIPTION="A small, fast, and high performance math library for robot applications" -HOMEPAGE="https://github.com/ignitionrobotics/ign-math" -SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="6/6" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-cpp/eigen:3 - dev-build/ignition-cmake:2" -BDEPEND=" - dev-build/ignition-cmake:2" - -S="${WORKDIR}/${PN}6_${PV}" diff --git a/sci-libs/iml/Manifest b/sci-libs/iml/Manifest index dbe7fb9bc073..7914f41eaf15 100644 --- a/sci-libs/iml/Manifest +++ b/sci-libs/iml/Manifest @@ -1,4 +1,5 @@ AUX iml-1.0.4-use-any-cblas-implementation.patch 865 BLAKE2B 5167ab1a5f82e5fce596dd3f7cdb3a711f0fd5c86fefc6a36574bcbc63e464115895e43d81eba3d4d04bd016266817440098eed18fab04b30bc45dee37497ffd SHA512 36181f90032b6f4d786d50b327cb342d5c8f4431dd556e4267e99b02e92161adbb9c23d7815e1764d8f237b1f008b2abebc27bdc422ba7296144999f0cde3c19 DIST iml-1.0.5.tar.bz2 391757 BLAKE2B 5895b353269ce19e17e2522f78eb705c89a47ed3c6cce54d1b7ab3003f59d0a13050b30ce9cedbf38392c737c169740b6c2433f1a74856b0f9d4e6e007ebf804 SHA512 b5a85982636035cc50acba7dcff5478c6271be3669313f01915b2761302d4c77617c0dd7932daf74433098670d3ffdb2ef19eb24450b40709750a0b7c8f797f1 +EBUILD iml-1.0.5-r1.ebuild 817 BLAKE2B 83ce2f1e1c5a5a8aca8754fb198f2164636a38257a1441b2bb22685781a72aba68434b8c16168201a672705f9c10c023322f86b921abb8010a52f591953d5763 SHA512 f4c14882a71f9b59addacc315109c66b1ac29e9e869197231444b87d9e85674f83093648422c9776461a2504a6ecd96ffc8b5ea01e440578be183e1668aa32df EBUILD iml-1.0.5.ebuild 766 BLAKE2B 4c9b448852590c3cb49c8c0c8f4c9d8ffc8f37022f7a3f16d18ef2c2f4defc5cc4aeefdadf62798c5f7c335d21db3c456bc8350feacc5a5814ffa1a9ee5d7d86 SHA512 033e3935ef2d5dec173cd1ebe54d366fd118b4989a411f97875e2d23adb21d0558181670d39f5ce274f600f2e00f177dbd82ac7fb0f86a26edc737cefb4bbd55 MISC metadata.xml 435 BLAKE2B 2dcbbbbeab2b53ad1407e3e52e4a0067853099061866f8a1f20eabd82ef7eeafc34fc806701a0b496ea874d5c47ed46c3963d5f0996e623eaf5172bd99141ce0 SHA512 f3ed1aacb63866ab9e5df4d62d8c5dd50a264d32fa1c52f1b960822904c185cbdc0ae708b391e321378b1bdf1de29bb4073752c43bb82609877ff607d65d2c16 diff --git a/sci-libs/iml/iml-1.0.5-r1.ebuild b/sci-libs/iml/iml-1.0.5-r1.ebuild new file mode 100644 index 000000000000..f967cdfd1ab6 --- /dev/null +++ b/sci-libs/iml/iml-1.0.5-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Integer Matrix Library" +HOMEPAGE="https://www.cs.uwaterloo.ca/~astorjoh/iml.html" +SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2" + +# COPYING is GPL-2, but the files under src/ all have a BSD header +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +DEPEND="virtual/cblas" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog README ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.4-use-any-cblas-implementation.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-default="${EPREFIX}"/usr \ + --enable-shared \ + --disable-static +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index a2e81699ffe5..0c0e55d92266 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,6 +1,5 @@ -AUX indilib-2.0.7-fix-system-httplib.patch 1359 BLAKE2B d2a8000039bedef796d7e751000320bb3aaa69563fc5ef878d0b4c8b2a274087d30230388cc5b05a9fcb25f4b5369ce501d9b13d7f88dbf213096b9f893b3c62 SHA512 81ed02c6a92a4e2143551f4e2abdaacf44d747bb4c4cb06b18807fc005c4c97b87a4d0830dea6d6f8a473162d5863eee6d0aceab6396c2a3a35b9e951c2b7dc3 -DIST indilib-2.0.7.tar.gz 2843758 BLAKE2B dee94a40d4b3c5c4d994d945a3608a41765af14c4937d475bdf80dca5d5847b814e0d9a1060f39b15b109916dee45f1876ce8edd29588e209276e3b1bf6f3dd7 SHA512 292c0a5b8f07b24c42ea9424be19012c97317206b837d8601ec4d771fa35c314bf00712509f8199ee3da193ea12f0c3e90036a49deece304dc256cdeba60810d DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9 -EBUILD indilib-2.0.7.ebuild 1954 BLAKE2B 83c4595530644a5211c6dfb415d60ead126b567fbbd42033a79ddecfe54f5ac7876de20a9064b9bba304a2c6dd1ad8d851024e437c81f9c4d59ae55129f741ae SHA512 96373f4b5e6070aa0785eb6a4e53c73c27cb6ccb98f8e2475995a385e56cd4cfe88ee77c6f5ecb43dc0efb170a545768bff3921c71961483fc475a2ba211dd00 -EBUILD indilib-2.0.8.ebuild 1897 BLAKE2B 8a544c9f323b97ebe1d615c585ab38fb832299b0dccbe2b1c1e72b9486328840add58ba72c7efe098e2c62c82441e9c376e47ccce3d33adbb8a73d3b91dfaaef SHA512 7a2ad54c7624ec6dd798d3b54e092b289365b5719d77577362f92801f9a059de00f1360c49b215853321b4c846947a23da879142c596f5f68a2aabb5da28dc21 +DIST indilib-2.0.9.tar.gz 2894181 BLAKE2B 888209ce864ee324c842b1847c4f2c9b279a614b81be66597cc194cd7d67327565a1cd30b2c22b76c467ba513d1d61215bdf91161a634421ed36737b4256340b SHA512 b5e1ef58c2139bd5dd79e72d9d25d5c0730f29dff2db0001db5b1d0eff029f60f714c13e14e820f5ccfa8ab6cba25f4cd16e699f9842fa722ef961d00fc8c4a4 +EBUILD indilib-2.0.8.ebuild 1775 BLAKE2B 301589c8be496391d5dbe326f71246e275383bf1c3beef2cd663621364b256fbbae489dc9bae5286cf3fde301ed74b65e025a52ab98523f235d979fe8c96f297 SHA512 10e2de746c8a61ef3a7ddea8c0c0a03fb368bc12165eb0c1a37f635dc5737e198163f0c415298b8e1f065676ff58fc7ad475db0597293e6e3710db82fd59ae5b +EBUILD indilib-2.0.9.ebuild 1776 BLAKE2B 06fddaa942b71ff3e6aee230a5de2a8427461cbff115a23a5ec5e1fa42112106b9f2c95ceed7cc83b88d3a4b9cb34fe617096379590b85a98f11c7bbd71d7288 SHA512 99543b62d875a26ecfd01bdf8b725cea186be31eb73b847f417c5515ec828cf04aac8677522e82446736f3e403b379dbd3c0e7348fee9a886bfd8e22cde11a3d MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f diff --git a/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch b/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch deleted file mode 100644 index 81876a468fa2..000000000000 --- a/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1d9e7a4645aa9d1c8534a0e69c3fb212382ac1ed Mon Sep 17 00:00:00 2001 -From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> -Date: Fri, 12 Apr 2024 11:31:01 +0200 -Subject: [PATCH] Link against httplib if using system libraries (#2039) - ---- - drivers/auxiliary/CMakeLists.txt | 2 +- - drivers/dome/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/auxiliary/CMakeLists.txt b/drivers/auxiliary/CMakeLists.txt -index 66f7e3a615..41279d0a9d 100644 ---- a/drivers/auxiliary/CMakeLists.txt -+++ b/drivers/auxiliary/CMakeLists.txt -@@ -313,5 +313,5 @@ SET(dragonlight_SRC - dragonlight.cpp) - - add_executable(indi_dragon_light ${dragonlight_SRC}) --target_link_libraries(indi_dragon_light indidriver) -+target_link_libraries(indi_dragon_light indidriver ${HTTPLIB_LIBRARY}) - install(TARGETS indi_dragon_light RUNTIME DESTINATION bin) -diff --git a/drivers/dome/CMakeLists.txt b/drivers/dome/CMakeLists.txt -index 9dfdc812b8..377af11d2f 100644 ---- a/drivers/dome/CMakeLists.txt -+++ b/drivers/dome/CMakeLists.txt -@@ -80,5 +80,5 @@ SET(dragonlair_SRC - dragonlair.cpp) - - add_executable(indi_dragonlair_dome ${dragonlair_SRC}) --target_link_libraries(indi_dragonlair_dome indidriver) -+target_link_libraries(indi_dragonlair_dome indidriver ${HTTPLIB_LIBRARY}) - install(TARGETS indi_dragonlair_dome RUNTIME DESTINATION bin) diff --git a/sci-libs/indilib/indilib-2.0.8.ebuild b/sci-libs/indilib/indilib-2.0.8.ebuild index 77b317737296..0cfc49a84aa4 100644 --- a/sci-libs/indilib/indilib-2.0.8.ebuild +++ b/sci-libs/indilib/indilib-2.0.8.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic udev +inherit cmake udev DESCRIPTION="INDI Astronomical Control Protocol library" HOMEPAGE="https://www.indilib.org/" @@ -43,11 +43,6 @@ DEPEND="${RDEPEND} " src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/878525 - # https://github.com/indilib/indi/issues/2023 - filter-lto - local mycmakeargs=( -DINDI_SYSTEM_HTTPLIB=ON -DINDI_SYSTEM_JSONLIB=ON diff --git a/sci-libs/indilib/indilib-2.0.7.ebuild b/sci-libs/indilib/indilib-2.0.9.ebuild index 982a14057620..5550e43e5885 100644 --- a/sci-libs/indilib/indilib-2.0.7.ebuild +++ b/sci-libs/indilib/indilib-2.0.9.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic udev +inherit cmake udev DESCRIPTION="INDI Astronomical Control Protocol library" HOMEPAGE="https://www.indilib.org/" @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" @@ -42,14 +42,7 @@ DEPEND="${RDEPEND} websocket? ( dev-cpp/websocketpp ) " -PATCHES=( "${FILESDIR}/${P}-fix-system-httplib.patch" ) - src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/878525 - # https://github.com/indilib/indi/issues/2023 - filter-lto - local mycmakeargs=( -DINDI_SYSTEM_HTTPLIB=ON -DINDI_SYSTEM_JSONLIB=ON diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index ed449c6a5e27..0a2ea370fba4 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1,5 +1,8 @@ AUX kineto-0.4.0-gcc13.patch 255 BLAKE2B 5633abeae41fd306a6d66d4e0f72040abbcc27b052a9802c94235c4afcff5ed99f3ac0df9ed712c6d4a57345d666442ea89bcc84f9f7d333d2ec77be9246a1d5 SHA512 db55567e22355f7ca98959f6a385b103474b2aeed0684f48e0c2e043754defc888fbd6ae997c3e5909329777d662b2e4e1b85520192da7fcae32845798c4565d AUX kineto-0.4.0_p20231031-gentoo.patch 2997 BLAKE2B 123603ac81512b12800a0ef82fd0f573891c4170a16156f87afbdb7004608cf2593eccd23541aa2f042137762dc5d4a1d4013e9fa42303fb8e60066f96529030 SHA512 e7f4d0c7418cb3d4b00cd231b03692dd6b0fd3c29d54f6db557bb87d4ab000e5020d03fffec1583b7c2df8b0431e7f263a4c892eadc16e04ce8af2c9032b47fe +AUX kineto-0.4.0_p20240525-libfmt-11.patch 2191 BLAKE2B c6fec2eb3f79222d1224572801864d55759b75ea73de6273566b83a47dfdb051235da1290021125a113cd6152e24cf753b177890d022d98e3904e346eb47b54a SHA512 e039c0c0845cf807eb6550ff6f9de1e736786df7b78ec4aac370025377e28c64dcb05e776040244c43d819ed3fe0200ae50d8b4d1f77d34ab0c3819c01ab14b8 DIST kineto-0.4.0_p20231127.tar.gz 8234629 BLAKE2B ac6e13340817eb283e387e699e70e5113571b258ee3ebf72f2d4a54a6349be22d84701ddec67fbc72d12be3fb0c321a71c8dd64a7f8a6d679522c49f21304fbc SHA512 316db3db624ae36720c0fcabb81f70c31b94ea64f18bc103aeadb75a25e06e113a774a3ec0c769881960ad61f3c2210172ccde1c451df653e7c430fbe89e4d9a +DIST kineto-0.4.0_p20240525.tar.gz 8243259 BLAKE2B 677529d327254c26000271a6c845356604598fb05ba57befd0e5cbd0f112f6776d2851ea1e2a7671a38ee6cb06df45db68ff0435fcddbf69496db43f5ec1e7ee SHA512 41a08c7da9eea7d12402f80a5550c9d4df79798719cc52b12a507828c8c896ba28a37c35d8adf809ca72589e1d84965d5ef6dd01f3f8dc1c803c5ed67b03a43a EBUILD kineto-0.4.0_p20231127.ebuild 957 BLAKE2B a62c333c0089d569a33f62e7618982740a5178dba049e89e9f62933a342612893e439095e7ec1c534efdebd1dd61d3c3bd6b53ba3cfe95ed8692ca19ce2ee813 SHA512 98ab412ff156c0b065e2a517798f0ad03c8d5205d017d246bd9392a6d574cdceb0df056288eb83018eaad406493e80e69e65a0a7d6a0c5465e9c2ebad4d122ac +EBUILD kineto-0.4.0_p20240525.ebuild 1067 BLAKE2B d8bf1c1c5b4e8c407ca1d1716895f3a5ccb95f4a691901fe84bd2e637e43fb01610addfba0a983c1461721fda33f95fa4cbe2d30ad4a32965f585f38eecbe949 SHA512 db4b499cd3c8973d4ce40e35588b91bbb3177292d3989251084c3cf2167f6225ab2ff9de317155fe48037b9bf977d1017e62f2585298aea5beba9dc3ae671550 MISC metadata.xml 327 BLAKE2B f48b87396bdfbc5a12b807941e162b596bbf760252fbfd08dc05ef8aeb9dcd8fc1b0ed3c8d4ec5f531da5a7315a041b8db7b0f6449c86fc52fba4f6d4476beb5 SHA512 9f6906e171f530b6f5de417338af00c26681fe757d823b4ab88cb9749506404c2d9baa96ea3c71c4fe523f6f5877a81e20f2378abe4a2e9895e501829e3fe85d diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch b/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch new file mode 100644 index 000000000000..d9ad7a3dbae9 --- /dev/null +++ b/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch @@ -0,0 +1,91 @@ +https://github.com/pytorch/kineto/commit/eb34f147f2af821da931c18457c26b076c8491dd +https://github.com/pytorch/kineto/pull/959 +https://github.com/pytorch/kineto/issues/958 + +From eb34f147f2af821da931c18457c26b076c8491dd Mon Sep 17 00:00:00 2001 +From: Aaron Gokaslan <aaronGokaslan@gmail.com> +Date: Fri, 12 Jul 2024 09:23:33 -0700 +Subject: [PATCH] Update libfmt to 11-0-0. Closes #958. (#959) + +Summary: +Fixes https://github.com/pytorch/kineto/issues/958 + +Pull Request resolved: https://github.com/pytorch/kineto/pull/959 + +Reviewed By: davidberard98, yoyoyocmu + +Differential Revision: D59637583 + +Pulled By: aaronenyeshi + +fbshipit-source-id: 48def339ed3097ecb4746d7870203040ac535858 +--- a/src/Config.cpp ++++ b/src/Config.cpp +@@ -12,6 +12,7 @@ + + #include <fmt/chrono.h> + #include <fmt/format.h> ++#include <fmt/ranges.h> + #include <chrono> + #include <fstream> + #include <functional> +--- a/src/CuptiRangeProfilerConfig.cpp ++++ b/src/CuptiRangeProfilerConfig.cpp +@@ -12,6 +12,7 @@ + #include <stdlib.h> + + #include <fmt/format.h> ++#include <fmt/ranges.h> + #include <ostream> + + +--- a/src/DeviceProperties.cpp ++++ b/src/DeviceProperties.cpp +@@ -9,6 +9,7 @@ + #include "DeviceProperties.h" + + #include <fmt/format.h> ++#include <fmt/ranges.h> + #include <vector> + + #if defined(HAS_CUPTI) +--- a/src/EventProfiler.cpp ++++ b/src/EventProfiler.cpp +@@ -10,6 +10,7 @@ + + #include <assert.h> + #include <fmt/format.h> ++#include <fmt/ranges.h> + #include <time.h> + #include <algorithm> + #include <cmath> +--- a/test/CuptiActivityProfilerTest.cpp ++++ b/test/CuptiActivityProfilerTest.cpp +@@ -7,6 +7,7 @@ + */ + + #include <fmt/format.h> ++#include <fmt/ranges.h> + #include <folly/json/json.h> + #include <gmock/gmock.h> + #include <gtest/gtest.h> +--- a/test/CuptiRangeProfilerConfigTest.cpp ++++ b/test/CuptiRangeProfilerConfigTest.cpp +@@ -10,6 +10,7 @@ + #include "src/CuptiRangeProfilerConfig.h" + + #include <fmt/format.h> ++#include <fmt/ranges.h> + #include <gtest/gtest.h> + #include <time.h> + #include <chrono> +--- a/test/CuptiRangeProfilerTest.cpp ++++ b/test/CuptiRangeProfilerTest.cpp +@@ -16,6 +16,9 @@ + #include <fcntl.h> + #endif + ++#include <fmt/format.h> ++#include <fmt/ranges.h> ++ + #include "include/libkineto.h" diff --git a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild b/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild new file mode 100644 index 000000000000..2c0e437f0197 --- /dev/null +++ b/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild @@ -0,0 +1,52 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-any-r1 cmake prefix + +CommitId=be1317644c68b4bfc4646024a6b221066e430031 + +DESCRIPTION="part of the PyTorch Profiler" +HOMEPAGE="https://github.com/pytorch/kineto" +SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=" + dev-libs/libfmt + dev-libs/dynolog +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( dev-cpp/gtest ) + ${PYTHON_DEPS} +" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.0-gcc13.patch + "${FILESDIR}"/kineto-0.4.0_p20240525-libfmt-11.patch +) + +src_prepare() { + cd libkineto + cmake_src_prepare +} + +src_configure() { + cd libkineto + local mycmakeargs=( + -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/ + -DKINETO_BUILD_TESTS=OFF # tests require cuda toolkit + ) + eapply $(prefixify_ro "${FILESDIR}"/${PN}-0.4.0_p20231031-gentoo.patch) + + cmake_src_configure +} diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest index b4ba0e78018b..0e781eebc0e5 100644 --- a/sci-libs/libnova/Manifest +++ b/sci-libs/libnova/Manifest @@ -1,4 +1,6 @@ +AUX libnova-0.16.0-cflags.patch 440 BLAKE2B dd10b9adf008c2de9e10f4348e47a3b345afbb529a0ebc1be0859a90f363e126691c8962445f2bd8ff1ddd26dbe051f583ba66a2010bb90353b1746d082e4586 SHA512 487f89469e8ac30128ee24fb5ae58ed6d72ae525257006d92fbfb29d7b430773cd7b32e03c626d0469e687bc85edea7e222a3ae17710244e906836f605420f35 +AUX libnova-0.16.0-gcc14.patch 546 BLAKE2B ddabf173961a400abbd7926699669acdcb8839205c8977933375b03296d8b81d167271896cf1e4b5d16e1aa3b15c12fd632fc5bbb21eba34e85b7247c834c8dd SHA512 0fef4bc6c191fb0de5f7754d05b5da536c7529f89055d705d0fd062d3b8c243c820a79ad6aa5d8023a6145952240ce7bdab12ad1d587c261d60bbc3ebb01c697 AUX libnova-0.16.0-slibtool.patch 577 BLAKE2B 333476b9d79c82a62e3387f15658ac522a2747b71727372a4dae3d0fdc307897c78aa5309026a9ee773cfe00364aaf4c056e2cf121717d37c495eace03fd8839 SHA512 1057249337cee731109835744424f88b99a9357342e3c2023a156d543eb2568048a0db23c4e86d51cb0d416a2dc94954b2bfa7fc4a3bcc0ae64629249a971f70 DIST libnova-0.16.0.tar.xz 909212 BLAKE2B ae7efef8295dafd3715c37506d7403fc38a951c9a7c43e41e3c6ca3c922243a396052bbb71f07901bbd3aae2b2bee183efbd9e3e9c50dce72379f6ced80d5701 SHA512 f1c33421b7f09097223afe1bd5c31fa9a4591e4c965ba8a5ae1f164367717aa03986970ffe9c01e400b27aea43843fbb67cfbfe6ef44ec2c519f524aab9ea86f -EBUILD libnova-0.16.0.ebuild 913 BLAKE2B 0de79d09afd6131cef0f2f3be9bfe50b958ede56b08c155dd0cf3c3a10d8ab298a560127eade980a229cbe5fcaa6e7199ca1183534bbad35e089a4f36538aa54 SHA512 972223a3db550a4dd72b406ff18ff524e579734ee0e2d1fa22bd252bdbf0cade0cc0a3852339aaad2bfd2f918c2ea45b7c4ba27898a94911213534a986427784 +EBUILD libnova-0.16.0.ebuild 947 BLAKE2B 997d3189c40ac2a40a7e07fadc1ca1167e066cb9cb77842cc7d884a6cc548a3c63210022c845ba3404433526b028161794313f31302b5d0bb40f42a8646cae66 SHA512 a7007113161b9cd8d3483c62a59ad1e7a04542fbd25a5377c8020873346d7f2ccaa1a76d28db51b75ab7e8723ee09a15add2055873ecee20baaa1432f8e39a06 MISC metadata.xml 640 BLAKE2B d8db8975700f5d7c96c3844120efc66ba262a2d121f62479b7552e31f46358036cfd4e8a7b91decc899036c4719b5d3c2f8c0aa0427f0252481a635daec5b215 SHA512 3193ac9e5621ea1b142ceea70cc9192d77ba694a217fa734d2521549acde8149fdaf231f1cf5befd72a203893d36ed707b88a664b054bbdf2c47a3fd82bd64fa diff --git a/sci-libs/libnova/files/libnova-0.16.0-cflags.patch b/sci-libs/libnova/files/libnova-0.16.0-cflags.patch new file mode 100644 index 000000000000..fcb06a9360c9 --- /dev/null +++ b/sci-libs/libnova/files/libnova-0.16.0-cflags.patch @@ -0,0 +1,23 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-AM_CFLAGS = -Wall -O3 $(AVX_CFLAGS) ++AM_CFLAGS = $(AVX_CFLAGS) + + SUBDIRS = libnova elp + +--- a/src/elp/Makefile.am ++++ b/src/elp/Makefile.am +@@ -1,6 +1,6 @@ + noinst_LTLIBRARIES = libelp.la + +-AM_CFLAGS = -I ../ -Wall -O3 $(AVX_CFLAGS) ++AM_CFLAGS = -I ../ $(AVX_CFLAGS) + + libelp_la_SOURCES = \ + elp1.c \ +-- +2.45.2 + diff --git a/sci-libs/libnova/files/libnova-0.16.0-gcc14.patch b/sci-libs/libnova/files/libnova-0.16.0-gcc14.patch new file mode 100644 index 000000000000..330952d058bf --- /dev/null +++ b/sci-libs/libnova/files/libnova-0.16.0-gcc14.patch @@ -0,0 +1,24 @@ +From 1be82238860bba941b1b16c6f31763577a17b8af Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 6 Aug 2024 21:49:52 +0200 +Subject: Fix build with >=GCC-14 + +--- + src/parallax.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parallax.c b/src/parallax.c +index 733e26c..0c11f04 100644 +--- a/src/parallax.c ++++ b/src/parallax.c +@@ -17,6 +17,7 @@ + */ + + #include <math.h> ++#include <libnova/earth.h> + #include <libnova/parallax.h> + #include <libnova/utility.h> + #include <libnova/sidereal_time.h> +-- +2.45.2 + diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild index bc3ef11b3d3a..c590ea70af79 100644 --- a/sci-libs/libnova/libnova-0.16.0.ebuild +++ b/sci-libs/libnova/libnova-0.16.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -16,17 +16,17 @@ IUSE="doc examples" BDEPEND="doc? ( app-text/doxygen )" -PATCHES=( "${FILESDIR}"/${P}-slibtool.patch ) +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-gcc14.patch # bug 886455 +) src_prepare() { default eautoreconf } -src_configure() { - econf --disable-static -} - src_compile() { default use doc && emake -C doc doc diff --git a/sci-libs/libsemigroups/Manifest b/sci-libs/libsemigroups/Manifest index 9a458c501bde..48f6080f91d0 100644 --- a/sci-libs/libsemigroups/Manifest +++ b/sci-libs/libsemigroups/Manifest @@ -1,3 +1,4 @@ +AUX libsemigroups-2.7.3-gcc-15-buildfix.patch 954 BLAKE2B d165a52b019293f0a074f2737ae3d224cb6cec8b5b9327932b2eda59fac1f6534b5ba374e97f09a25fbf8b0e9fb51e7c34b6e618570c9dafce04d7e7fc8d0aa9 SHA512 fe210da5c4ad00681ad941ec1add9ef67877a705694914f081f0262e23ec5aa7b5fb7e461f9e5925bc7b59dd19f88cec5ec17160f5bea0a0a4480845078d3eae DIST libsemigroups-2.7.3.tar.gz 2543883 BLAKE2B 02700cb9f132d7121ce42f978e9a1c01ed9f1957fab0da45c60837240639f7a049d3b7e1f9b989be71de8b85a669b475733aeb0e96760eda846b50db903da895 SHA512 001cfdfc55ee9a0bb3fe0914229905083e8eaaec682952bb23b2dc44680631909478bf32e67e93488a7347bfb674305b0cc3b713afa9bce1997a0b1a5693ad36 -EBUILD libsemigroups-2.7.3.ebuild 639 BLAKE2B 2f2553604dacfe5f91e99410653cc1ec0e4450d1a2689a6191bcfe9b8f1a2a4860091b6557479fc09bc95b8e5c62e5bd28672cc6b5400f94cfeb336cbb94397f SHA512 06aba928b8ef6e31393d1dcd62bffaad106eed4f2eef667d8b9cc1b021419b4817bc9de85843b7af2aea7d625d263c1ca408e2fe65eed974bc8cdd3afe371807 +EBUILD libsemigroups-2.7.3-r1.ebuild 693 BLAKE2B 3ecf9bdffd8f043bfc840ba21fd27df66dd638f19e335509bc35394034173562a801adc77f11405ca215fd76ffd0de67147391b3018028ca6043d95556d8ee11 SHA512 aeb03139c64253b3a1092b91ab10b59748de3739f31be6f16227151d42cd7446cb8d826a4ec1a673d27de57e4bd8d924f5457e47444f81a5dacadd6c53945815 MISC metadata.xml 2022 BLAKE2B 2d0c1fffcd43538e90c4fe0933b937b72819c7c407a93398e5c0dd27f0c812d06d627a5718cab39b70d16aae6688b1428a4bb474225194268121d93d9bbef190 SHA512 750a0cb255d9ee40cb99c25d5ca76531413227b428b5aa97a12ed9b65313fa3afbe5ccf7acc8990e791fd8e7d1e749df30daf407d78620908e38a3d7880a0143 diff --git a/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch new file mode 100644 index 000000000000..40214b18b9ad --- /dev/null +++ b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch @@ -0,0 +1,22 @@ +From b7a413284e408280336ee681dd031877d779d0ea Mon Sep 17 00:00:00 2001 +From: "James D. Mitchell" <jdm3@st-andrews.ac.uk> +Date: Mon, 29 Jul 2024 11:13:32 +0100 +Subject: [PATCH] sims: fix issue 557 + +--- + include/libsemigroups/sims1.tpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/libsemigroups/sims1.tpp b/include/libsemigroups/sims1.tpp +index bc8bda372..698845222 100644 +--- a/include/libsemigroups/sims1.tpp ++++ b/include/libsemigroups/sims1.tpp +@@ -619,7 +619,7 @@ namespace libsemigroups { + typename Sims1<T>::iterator_base& + Sims1<T>::iterator_base::operator=(Sims1<T>::iterator_base&& that) { + _extra = std::move(that._extra); +- _longs = std::move(that.long_rules()); ++ _longs = std::move(that._longs); + _max_num_classes = std::move(that._max_num_classes); + _min_target_node = std::move(that._min_target_node); + _felsch_graph = std::move(that._felsch_graph); diff --git a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild index 04bbfd48d7b9..15fff4b3b57d 100644 --- a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild +++ b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild @@ -13,6 +13,8 @@ SLOT="0/2" KEYWORDS="~amd64 ~x86" IUSE="cpu_flags_x86_popcnt" +PATCHES=( "${FILESDIR}/${P}-gcc-15-buildfix.patch" ) + src_configure() { econf \ $(use_enable cpu_flags_x86_popcnt popcnt) \ diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 2c8d121e0136..6a6c6871d3b3 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -3,8 +3,6 @@ AUX libsigrok-0.5.2-py313.patch 1897 BLAKE2B b4221654e1a056e9e2bcf04b79685f23120 AUX libsigrok-0.5.2-swig-4.1.patch 377 BLAKE2B f795f46bce213e9444ea3d8b362a4d82d3e34676a9aae49f45764679effa388afcc15bc04e14fdc89cb25fbd700ca3bf80234b291c3607b0454ecf997d20997d SHA512 0334cbb95fbba961d9f16b18978dd15dbf68b80b897af54d25660dd0bcb049d21ea681f39bae3884c4869ecce4efd2601bce7825fbd41160ddddbe92ad678740 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 -EBUILD libsigrok-0.5.2-r3.ebuild 3400 BLAKE2B a9da2492c2a4ba0a39f61f00b372d225571de52be6d5cd7106be6bcce11ed07653118986767454409d4c5a2cf6eb09d83d7d11dfbb029ffa03510ea538684d58 SHA512 e7c37b9cfb92cdd3d06daa95304edd00cee9153acac135065d6fc99bf7f10be3232aa221a2391785c7e6af4a354c9667c4ccc3020ecf5fa536a23a0090ce404f -EBUILD libsigrok-0.5.2-r4.ebuild 3476 BLAKE2B a6dae62ddd641e772e831c3cf54356c081ea47afb834916f0c3fe10a576885c7fd8876663fcbce82005e306c4970e9f714389545f12d512c80b997b436f81797 SHA512 ecf01edaab3add793eb4f84bc3dac223dd85e5b182350535d088e6e32395a1c62f9b93dd650557064cc489d847eb96742deb2398f54bd0ce8dcef02b90798cbd -EBUILD libsigrok-0.5.2-r5.ebuild 3510 BLAKE2B 36f4e13576b4a3f92f7b2dbd5be8fcea98002b519274a17a829c8cdb1faa3bdc3f52a101f438431150ca3e421dea688e4213df35ef385a30b8b73d36c9b1090a SHA512 b736cc0b942209b0c19f339a367304d2bc1d240798d4b3f0d90e23d882cdc0deb5c5de53a39bd46564c0a3d9ee526b669791f6dc6709c19d90d8c98cafa341a3 +EBUILD libsigrok-0.5.2-r5.ebuild 3509 BLAKE2B ed3a3abdca28db5b1f4e6c0da4994e6273d4d6d9a0401d7a9c018b4fdeeb7077f228d2a9ea46bf8b0aef6dc4c1d8b41090c8b2f059f0f8261bd7bdf168fc2c22 SHA512 c0484adf935f8087ad62b24000e01902a0c49892a3f6deeceed92da73582603e2c1b59127fed85807d7b650e104a58957eb95e500601c10dae3b19bcfe015a37 EBUILD libsigrok-9999.ebuild 3329 BLAKE2B 4f3a222ed15a2a2b057b7fa65114b2a44bc3741e3d7e9b01d44d517421954a972be2b0eb9790913124d7a53d3fba7595e5d599f3114484a02ceb0a2b08c0d137 SHA512 e10bab831369b9fbf2ad20366fc59eec2dacb77787ec2cbe3d4b249de4a0dae3004a18f1597d19d97d7ba914996c1c2f8aa5c880953844b5db070200a86703da MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6 diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild deleted file mode 100644 index 42e7e0714558..000000000000 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" -HOMEPAGE="https://sigrok.org/wiki/Libsigrok" - -LICENSE="GPL-3" -SLOT="0/4" -IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb" -REQUIRED_USE="java? ( cxx ) - python? ( cxx ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# We also support librevisa, but that isn't in the tree ... -LIB_DEPEND=" - >=dev-libs/glib-2.32.0[static-libs(+)] - >=dev-libs/libzip-0.8:=[static-libs(+)] - bluetooth? ( >=net-wireless/bluez-4.0:= ) - cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) - ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) - hidapi? ( >=dev-libs/hidapi-0.8.0 ) - parport? ( sys-libs/libieee1284[static-libs(+)] ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] - ) - serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) - usb? ( virtual/libusb:1[static-libs(+)] ) -" -RDEPEND=" - java? ( >=virtual/jre-1.8:* ) - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( ${LIB_DEPEND} ) -" -DEPEND="${LIB_DEPEND//\[static-libs(+)]} - cxx? ( app-text/doxygen ) - java? ( - >=dev-lang/swig-3.0.6 - >=virtual/jdk-1.8:* - ) - python? ( - >=dev-lang/swig-3.0.6 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - ) - test? ( >=dev-libs/check-0.9.4 ) - virtual/pkgconfig -" - -S="${WORKDIR}"/${P} - -PATCHES=( - # https://sigrok.org/bugzilla/show_bug.cgi?id=1527 - "${FILESDIR}/${P}-swig-4.patch" - # https://sigrok.org/bugzilla/show_bug.cgi?id=1526 - "${FILESDIR}/${P}-check-0.15.patch" -) - -pkg_setup() { - use python && python_setup - java-pkg-opt-2_pkg_setup -} - -src_unpack() { - [[ ${PV} == *9999* ]] && git-r3_src_unpack || default -} - -sigrok_src_prepare() { - eautoreconf -} - -src_prepare() { - default - sigrok_src_prepare - use python && python_copy_sources -} - -sigrok_src_configure() { - econf \ - $(use_with bluetooth libbluez) \ - $(use_with ftdi libftdi) \ - $(use_with hidapi libhidapi) \ - $(use_with parport libieee1284) \ - $(use_with serial libserialport) \ - $(use_with usb libusb) \ - $(use_enable cxx) \ - $(use_enable java) \ - $(use_enable static-libs static) \ - "${@}" -} - -each_python_configure() { - cd "${BUILD_DIR}" - sigrok_src_configure --disable-ruby --enable-python -} - -src_configure() { - sigrok_src_configure --disable-ruby --disable-python - use python && python_foreach_impl each_python_configure -} - -each_python_compile() { - cd "${BUILD_DIR}" - emake python-build -} - -src_compile() { - default - use python && python_foreach_impl each_python_compile -} - -src_test() { - emake check -} - -each_python_install() { - cd "${BUILD_DIR}" - emake python-install DESTDIR="${D}" - python_optimize -} - -src_install() { - default - use python && python_foreach_impl each_python_install - use udev && udev_dorules contrib/*.rules - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild deleted file mode 100644 index b1536e1afd6e..000000000000 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" -HOMEPAGE="https://sigrok.org/wiki/Libsigrok" - -LICENSE="GPL-3" -SLOT="0/4" -IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb" -REQUIRED_USE="java? ( cxx ) - python? ( cxx ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# We also support librevisa, but that isn't in the tree ... -LIB_DEPEND=" - >=dev-libs/glib-2.32.0[static-libs(+)] - >=dev-libs/libzip-0.8:=[static-libs(+)] - bluetooth? ( >=net-wireless/bluez-4.0:= ) - cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) - ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) - hidapi? ( >=dev-libs/hidapi-0.8.0 ) - parport? ( sys-libs/libieee1284[static-libs(+)] ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] - ) - serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) - usb? ( virtual/libusb:1[static-libs(+)] ) -" -RDEPEND=" - java? ( >=virtual/jre-1.8:* ) - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( ${LIB_DEPEND} ) -" -DEPEND="${LIB_DEPEND//\[static-libs(+)]} - cxx? ( app-text/doxygen ) - java? ( - >=dev-lang/swig-3.0.6 - >=virtual/jdk-1.8:* - ) - python? ( - >=dev-lang/swig-3.0.6 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - ) - test? ( >=dev-libs/check-0.9.4 ) - virtual/pkgconfig -" - -S="${WORKDIR}"/${P} - -PATCHES=( - # https://sigrok.org/bugzilla/show_bug.cgi?id=1527 - "${FILESDIR}/${P}-swig-4.patch" - # https://sigrok.org/bugzilla/show_bug.cgi?id=1526 - "${FILESDIR}/${P}-check-0.15.patch" - # https://bugs.gentoo.org/878395 - "${FILESDIR}/${PN}-0.5.2-swig-4.1.patch" -) - -pkg_setup() { - use python && python_setup - java-pkg-opt-2_pkg_setup -} - -src_unpack() { - [[ ${PV} == *9999* ]] && git-r3_src_unpack || default -} - -sigrok_src_prepare() { - eautoreconf -} - -src_prepare() { - default - sigrok_src_prepare - use python && python_copy_sources -} - -sigrok_src_configure() { - econf \ - $(use_with bluetooth libbluez) \ - $(use_with ftdi libftdi) \ - $(use_with hidapi libhidapi) \ - $(use_with parport libieee1284) \ - $(use_with serial libserialport) \ - $(use_with usb libusb) \ - $(use_enable cxx) \ - $(use_enable java) \ - $(use_enable static-libs static) \ - "${@}" -} - -each_python_configure() { - cd "${BUILD_DIR}" - sigrok_src_configure --disable-ruby --enable-python -} - -src_configure() { - sigrok_src_configure --disable-ruby --disable-python - use python && python_foreach_impl each_python_configure -} - -each_python_compile() { - cd "${BUILD_DIR}" - emake python-build -} - -src_compile() { - default - use python && python_foreach_impl each_python_compile -} - -src_test() { - emake check -} - -each_python_install() { - cd "${BUILD_DIR}" - emake python-install DESTDIR="${D}" - python_optimize -} - -src_install() { - default - use python && python_foreach_impl each_python_install - use udev && udev_dorules contrib/*.rules - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild index ea6a56fc8bb3..61b96e87fe2a 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest index fe535a9505ea..86861b23c126 100644 --- a/sci-libs/libsvm/Manifest +++ b/sci-libs/libsvm/Manifest @@ -1,8 +1,6 @@ -AUX libsvm-3.25-makefile.patch 1563 BLAKE2B ed88feaf7f2b6ce51b39f7ed875c6ab880a6e323a610d4f3a01b5830bc79e4bdb98a322fe1d150c3d4abd5f80761241ea81e4ac398dce0cfe307f8729793b999 SHA512 5d37a6298586273e772d0f249f876a31b39895a3394ea470626ea845ac28bad4c0a552b88bc1c3103331c72590e7c485b042c329d58384c3a7337e0d6da6d07d AUX libsvm-3.25-openmp.patch 864 BLAKE2B ef67a094c7cd3cafa3c998caa78bd226d83e462e358caa4cf15382087962b1eb9214553ae560d7c13812178d5f9a528764589c9f805b479a4931f7f94f9b4fdc SHA512 60250a325b6d22a1d8404f1b1d8ecd1b47e28003982c8f851107598b0553125afefb9b0a2b2e940761646152c05d6fdcd438994cdc991c2bffe10a9d87923b04 +AUX libsvm-3.30-javaMakefile.patch 390 BLAKE2B e51552651a9efb66b1f1b5d2533f5829e721bb61f334a0723ef74da0b185c1551d5b29a6808b99045df0863d5cc8c7ddc12c17ad8356aa7217490ff33bcc4285 SHA512 be2fa7de2a111ac3c5f7ee8cac51c4d5db1a5e251baadb27a3f37869b5597c02eef10717a53a0d404fc3c3cf50ee95ff8e06d1f748af97321d604649142333b3 AUX libsvm-3.30-makefile.patch 1443 BLAKE2B 3b8009da6985170045b0d5d319869d89126c9577fa92aaf97bba76b94f4210bb6a40c1629354f30bbc93984a408e121341f9c00a37f824ea367475b2a86849b2 SHA512 a28ac993ea9746a5eb569161d8974108b5b758b4f181f5ce9891a15dd3e1b67dc8f57f934852d8c6660f4ca5be875e70e7064bf0e449e78c6a79cc0e72a75485 -DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98 DIST libsvm-3.3.tar.gz 910001 BLAKE2B 69364210998e496e333c6a87a66ad3f1515f2b3e98fe7bc579e8aee6d4df0473a4282f979d4f7d1729ce7080fd8b009ce830caab0ac37b57fafff0d2686e86e0 SHA512 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d -EBUILD libsvm-3.25-r1.ebuild 2507 BLAKE2B 71108ec61dee425d3b6cd863cf908567f2946283e2437dcfb921e9a451bccacc409e93a028505fbec0aec4a623a6d5ffd05eef281d7ce7e9cb08c0c47ef8045c SHA512 83f3ca9e203a31bcaa73dc11483197e121e9b1974e7c3f4f37e5ce917c1535547605c91917b3a413d56d6ade0ba07a02e1c495c1b55464273c59a1c5a4c24f8a -EBUILD libsvm-3.30.ebuild 2533 BLAKE2B da60a97837ffa44a59cb0ba428afedb4885e3d48a46631e123ecfd2ea5b2cd177701e42480ff851f1685e7c36368ada948546480c8194c0684267cf20bb3633a SHA512 3bbc1d7dc94cec88f7853200a055947d900eeb6bfbeb65d197d0bf93be471ea9684d629d3779e5daf9e788786d9028e1d6411025475794ec35ff0bdfbcca5c18 +EBUILD libsvm-3.30.ebuild 2463 BLAKE2B 8610bbac395bef87efe21371b2ec2914436ff1d898964e3952e98089a4c68a29e0fc6d7092b21cbeb6bfcc7a8fad061f53d1043507c631b0c865b896b2768e48 SHA512 6cc4f3d959945cc42512aa6b6a76fde2a8a9b2a312786b874a6d8d22c791c8d9f53333ca7c407c9b2a3632d897f669a66b915391f54ce7d63f9e82e14cb2a4b1 MISC metadata.xml 816 BLAKE2B 59108eaf569019b5adde56aa0197503346d53d3ab07285c65768e4663f8aec41d441c1c8b894ddd4cf86f16d40784800918345a15cd48b8bc6f3fcf1da8dc08b SHA512 8a6fe72c2ad1f017e36bef14eed3d61909395bd2aaa13c561d7818942099f3b20fe020b5548053758c30ec7ba09c0e4f7238c6906452ad6c3f049a857cf8eac6 diff --git a/sci-libs/libsvm/files/libsvm-3.25-makefile.patch b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch deleted file mode 100644 index ea48368b27a5..000000000000 --- a/sci-libs/libsvm/files/libsvm-3.25-makefile.patch +++ /dev/null @@ -1,49 +0,0 @@ -* respect CFLAGS and CXXFLAGS from user -* compile with CC for C and CXX for C++ files -* propagate and respect user's LDFLAGS -* PIC only used for the library -* link the shared version library - ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,10 @@ --CXX ?= g++ --CFLAGS = -Wall -Wconversion -O3 -fPIC -+CFLAGS ?= -Wall -Wconversion -+CXXFLAGS ?= $(CFLAGS) - SHVER = 2 - OS = $(shell uname) -+PICFLAGS ?= -fPIC - --all: svm-train svm-predict svm-scale -+all: svm-train svm-predict svm-scale lib - - lib: svm.o - if [ "$(OS)" = "Darwin" ]; then \ -@@ -11,15 +12,17 @@ - else \ - SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \ - fi; \ -- $(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) -+ $(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) $(OPENMP_LIBS) ; \ -+ ln -s libsvm.so.$(SHVER) libsvm.so -+ -+svm-predict: svm-predict.o lib -+ $(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm -+svm-train: svm-train.o lib -+ $(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm -+svm-scale: svm-scale.o -+ $(CXX) $(LDFLAGS) $< -o $@ $(LIBS) - --svm-predict: svm-predict.c svm.o -- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm --svm-train: svm-train.c svm.o -- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm --svm-scale: svm-scale.c -- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h -- $(CXX) $(CFLAGS) -c svm.cpp -+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PICFLAGS) $(OPENMP_CFLAGS) -c svm.cpp -o $@ - clean: -- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) -+ rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so diff --git a/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch b/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch new file mode 100644 index 000000000000..a134ca1a44b1 --- /dev/null +++ b/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/936550 + +--- a/java/Makefile ++++ b/java/Makefile +@@ -4,8 +4,6 @@ FILES = libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \ + libsvm/svm_print_interface.class \ + svm_train.class svm_predict.class svm_toy.class svm_scale.class + +-#JAVAC = jikes +-JAVAC_FLAGS = -target 1.7 -source 1.7 + JAVAC = javac + # JAVAC_FLAGS = + export CLASSPATH := .:$(CLASSPATH) diff --git a/sci-libs/libsvm/libsvm-3.25-r1.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild deleted file mode 100644 index 43c67613dec8..000000000000 --- a/sci-libs/libsvm/libsvm-3.25-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) - -inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs - -DESCRIPTION="Library for Support Vector Machines" -HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/" -SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/2" -KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="java openmp python tools" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - java? ( >=virtual/jdk-1.8:* ) - python? ( ${PYTHON_DEPS} ) -" -RDEPEND=" - java? ( >=virtual/jre-1.8:* ) - python? ( ${PYTHON_DEPS} ) - tools? ( sci-visualization/gnuplot ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.25-openmp.patch - "${FILESDIR}"/${PN}-3.25-makefile.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \ - || die "Failed to fix paths in python files" - sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \ - || die "Failed to fix paths for svm-grid" - sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \ - || die "Failed to rename grid.py to svm-grid" - - if use java; then - local JAVAC_FLAGS="$(java-pkg_javac-args)" - sed -i \ - -e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \ - java/Makefile || die "Failed to fix java makefile" - fi -} - -src_configure() { - if use openmp; then - export OPENMP_CFLAGS="-fopenmp -DOPENMP" - export OPENMP_LIBS="-fopenmp" - fi - - tc-export CXX CC -} - -src_compile() { - default - use java && emake -C java -} - -src_install() { - dobin svm-train svm-predict svm-scale - dolib.so *.so* - doheader svm.h - - DOCS=( README ) - - if use tools; then - local t - for t in tools/*.py; do - python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py) - done - - mv tools/README{,.tools} || die - DOCS+=( tools/README.tools ) - - docinto examples - dodoc heart_scale - dodoc -r svm-toy - docompress -x /usr/share/doc/${PF}/examples - fi - - if use python ; then - installation() { - touch python/__init__.py || die - python_moduleinto libsvm - python_domodule python/*.py - } - python_foreach_impl installation - - mv python/README{,.python} || die - DOCS+=( python/README.python ) - fi - - HTML_DOCS=( FAQ.html ) - if use java; then - java-pkg_dojar java/libsvm.jar - HTML_DOCS+=( java/test_applet.html ) - fi - - einstalldocs -} diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild index e94e47acd243..d1fdc3096fce 100644 --- a/sci-libs/libsvm/libsvm-3.30.ebuild +++ b/sci-libs/libsvm/libsvm-3.30.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit java-pkg-opt-2 python-r1 toolchain-funcs @@ -31,6 +31,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.25-openmp.patch "${FILESDIR}"/${PN}-3.30-makefile.patch + "${FILESDIR}"/${PN}-3.30-javaMakefile.patch ) pkg_pretend() { @@ -43,6 +44,7 @@ pkg_setup() { src_prepare() { default + java-pkg_clean sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \ || die "Failed to fix paths in python files" @@ -50,16 +52,10 @@ src_prepare() { || die "Failed to fix paths for svm-grid" sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \ || die "Failed to rename grid.py to svm-grid" - - if use java; then - local JAVAC_FLAGS="$(java-pkg_javac-args)" - sed -i \ - -e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \ - java/Makefile || die "Failed to fix java makefile" - fi } src_configure() { + use java && export JAVAC_FLAGS="$(java-pkg_javac-args)" if use openmp; then export OPENMP_CFLAGS="-fopenmp -DOPENMP" export OPENMP_LIBS="-fopenmp" diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest index 7cec16db706b..60ae89098703 100644 --- a/sci-libs/linbox/Manifest +++ b/sci-libs/linbox/Manifest @@ -1,9 +1,5 @@ -AUX linbox-1.6.3-pc.patch 1082 BLAKE2B 7d5b055c0622b61245f193eb39d7e52951262c56456dceba5b3e72f54add82b2fc1660c4590eba2c4a97009bd78119893bfccb0909ed5374752f4bf563e75655 SHA512 5739738de34c28fb9970a869ee97a6ab528fd48e3f8b3d82f39966959fa97d6076a44263678d25c06bea3c46e06c8869ba4ea94484d5b57aee3a302df49fd06b AUX linbox-1.7.0-gcc14.patch 13096 BLAKE2B 7a18619522031ebae317c226009d4d11e92a5f257e95e4af4fce92312b5b24dd35b3b260c9847d5e5505e179416a2a1901946642c61a0ff5c76dd8735e295d26 SHA512 1566d9d59cc1a3f6ed28452e882d799194fa3e7acbd53d1faeaa27288efa15effba1d7d565bfb4dbc83f4717f5fd82d551e02a8cce463bc22ca3f1aa90a074c3 AUX linbox-1.7.0-hardened-testfails.patch 702 BLAKE2B df20b35fc72d67079fbd76da90b4ea4d0bf23da401929dc7b8e6c64acb380a3a8ca1d88728be568a3c72413351d013022c42c6e2b78e737f106160e607097160 SHA512 3b60caa03d2254b8d6ceadd92498bfddef1ac6ecc37d520ee2ed3f417c5f6b6982008455a03ec2a894f63fc4ec1ca3b3f189babf1d26e48ecae2bd3d5d8fb0d8 -DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c DIST linbox-1.7.0.tar.gz 2258420 BLAKE2B a416e7ab138c6f3f4778a00c0c1eb46aa0a5b26d84f19a2df93e9f8959d3237e5f298f8013f9414f66605c08eebd7d632f71dcdef7080c8df814afcd2de34456 SHA512 cb4e848186d1f6357f498d1e3bda6484b4c789c02440f9614a227a2ae206a31fb20b32be40bda74da3f2f8f981bbd58d80fc97c95499b5151bb06eafb867ef9e -EBUILD linbox-1.6.3-r2.ebuild 3960 BLAKE2B 1f730cba36d545e7971fe77bdf1e5a6237b5902390dc42cd387f16f5749a5a4d08fbead53d266105cf29bb5dcb5c5dc67783c51a603cb3454345f194276693f4 SHA512 308ff8895f27fc62d7c8fa84fa39850045c2d6443f2c1d2b46b52faaac89f6acd3876ed573ebc36c7f21e2b483bd71af085b3579c6f717136025e20596afcd51 -EBUILD linbox-1.7.0-r1.ebuild 3542 BLAKE2B 73e869d12213d152c60f79de9144af8f28786b08bff9a1f20f25f44170a2c75d9f177f19c36c9ee95848a5350795f0a9f8b8c11998771f4d30894140f1eea5d5 SHA512 75502befeefd0697758041c129a27bd60bbb2247e6375ec322e7567547ca0640b3a59f2ef99250b77bae44d2504b202b952c36704d77f00ce2fb0eef5cd4302f -EBUILD linbox-1.7.0.ebuild 3494 BLAKE2B fccd6311167d2b26e520988d96e6defe090639729571b082e66a82f0fd9ed6b0d0aec75aa6fe8a6745b5f73f0a9faf3af2915c97adee111a072490ba6584d545 SHA512 011471edc7c0031f5e44b580eb308b9c5b7de9c795b4f23239d40c742c9cb13d4c23e985abe31398b91a9e932cf752e0eb64de8b44f3ced329fae0f41d19bca6 +EBUILD linbox-1.7.0-r1.ebuild 3541 BLAKE2B f6a7ee2a193c78d34d293a5c832767c24d26121d71a7481af59da6a4955801b18c6f62775b4bdc233283641898a944939beb392e625dce4950a714c22de129a3 SHA512 347f4451a858ec608c3e7290bf5c8fad02e35852f822372c312216b3cd0aaf10fa5ec4ac284306334fabef41e0a0df3c5b9121cb3ceddc4fbb571e542c6a127b MISC metadata.xml 1177 BLAKE2B 57f2c859e73b86a679ba4e1ce568f006761799de57786b9fc60ac5d6a96641d39a6e51b04a86d802d3551ce38da8ff1c7eeb28f8831b605de3e5c786b0e7614e SHA512 78897bcff7d41ebcf9a0e521149cd90cb42234419b295738cf1881acf3f157cf935ad8b0de9e464fc99961831e8f0c0a31561b1bb42a2283f16ce646203f4774 diff --git a/sci-libs/linbox/files/linbox-1.6.3-pc.patch b/sci-libs/linbox/files/linbox-1.6.3-pc.patch deleted file mode 100644 index de0025108b89..000000000000 --- a/sci-libs/linbox/files/linbox-1.6.3-pc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8fb95a5dba51fbfcd37db10da4db69d518f7b0f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com> -Date: Fri, 24 Apr 2020 14:10:05 +1200 -Subject: [PATCH] Remove @LINBOX_SAGE@ from linbox.pc.in. linbox_sage is gone - and the string stays as garbage in the final .pc file. - ---- - linbox.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linbox.pc.in b/linbox.pc.in -index f54285e..1f83834 100644 ---- a/linbox.pc.in -+++ b/linbox.pc.in -@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library - URL: http://github.com/linbox-team/linbox - Version: @VERSION@ - Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0 --Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ -+Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ - Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@ @IML_CFLAGS@ @FLINT_CFLAGS@ - \------------------------------------------------------- --- -2.26.2 - diff --git a/sci-libs/linbox/linbox-1.6.3-r2.ebuild b/sci-libs/linbox/linbox-1.6.3-r2.ebuild deleted file mode 100644 index 550616620830..000000000000 --- a/sci-libs/linbox/linbox-1.6.3-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="C++ template library for integer and finite-field linear algebra" -HOMEPAGE="https://linalg.org/" -SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" - -BDEPEND="doc? ( app-text/doxygen )" - -# The project README says that gmp, givaro, and blas/lapack are required -# transitively via fflas-ffpack, but that's not true. The build system -# checks for them, and `git grep` shows that they're used directly. -DEPEND="dev-libs/gmp[cxx(+)] - =sci-libs/givaro-4.1* - =sci-libs/fflas-ffpack-2.4* - virtual/cblas - virtual/lapack - opencl? ( virtual/opencl ) - dev-libs/ntl:= - sci-libs/iml - dev-libs/mpfr:= - sci-mathematics/flint" - -# Use mathjax to render inline latex rather than requiring a working latex -# installation to generate bitmaps. -RDEPEND="${DEPEND} - doc? ( >=dev-libs/mathjax-3 ) -" - -PATCHES=( "${FILESDIR}/${PN}-1.6.3-pc.patch" ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - if use doc; then - # Avoid the need for a working LaTeX installation. MathJax does - # slow down the browser a bit but it also renders much more - # nicely than the latex-generated bitmaps would. - echo " - USE_MATHJAX = YES - MATHJAX_VERSION = MathJax_3 - MATHJAX_RELPATH = \"${EPREFIX}/usr/share/mathjax\" - MATHJAX_EXTENSIONS = ams - " >> doc/Doxyfile.mod || die - fi -} - -src_configure() { - # - # The --with-all flag includes, - # - # --with-givaro: used for finite fields, integer, etc. (required) - # --with-fflas-ffpack: small field dense linear algebra (required) - # --with-ntl: used for finite field, polynomial arithmetic (optional) - # --with-iml: used for fast integer/rational linear algebra (optional) - # --with-mpfr: not sure, doesn't seem to be used? (optional) - # --with-flint: used in algorithms/matrix-blas3 once (optional) - # --with-fplll: an fplll interface not directly used (optional) - # --with-doxygen: needed with --enable-doc to build them (optional) - # - # Some of these could be behind USE flags, but the ./configure output - # says that they're "not yet mandatory," which makes me think we might - # be overcomplicating things to make them optional right now. - # - # Note: after v1.6.3, we'll need to append --without-archnative to - # these flags to avoid -march=native being appended by default. - # - econf \ - --with-docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --with-all="${EPREFIX}"/usr \ - --without-fplll \ - $(use_enable doc) \ - $(use_enable openmp) \ - $(use_with opencl ocl) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse3 sse) \ - $(use_enable cpu_flags_x86_sse3 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - if use doc; then - # These files are used for incremental doxygen builds but aren't - # part of the final output. Check on - # - # https://github.com/linbox-team/linbox/issues/252 - # - # periodically to see if this is pointless. - find "${ED}/usr/share/doc/${PF}" -type f -name '*.md5' -delete || die - find "${ED}/usr/share/doc/${PF}" -type f -name '*.map' -delete || die - fi -} diff --git a/sci-libs/linbox/linbox-1.7.0-r1.ebuild b/sci-libs/linbox/linbox-1.7.0-r1.ebuild index 6f5e7d7b2b55..eef3546aca5d 100644 --- a/sci-libs/linbox/linbox-1.7.0-r1.ebuild +++ b/sci-libs/linbox/linbox-1.7.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar. # headers all say LGPL-2.1 LICENSE="GPL-2+ LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc opencl openmp" BDEPEND="doc? ( app-text/doxygen )" diff --git a/sci-libs/linbox/linbox-1.7.0.ebuild b/sci-libs/linbox/linbox-1.7.0.ebuild deleted file mode 100644 index 3fb0af5058b4..000000000000 --- a/sci-libs/linbox/linbox-1.7.0.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="C++ template library for integer and finite-field linear algebra" -HOMEPAGE="https://linalg.org/" -SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" - -# I think only macros/libtool.m4 (and COPYING) is GPL-2+; the source -# headers all say LGPL-2.1 -LICENSE="GPL-2+ LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc opencl openmp" - -BDEPEND="doc? ( app-text/doxygen )" - -# The project README says that gmp, givaro, and blas/lapack are required -# transitively via fflas-ffpack, but that's not true. The build system -# checks for them, and `git grep` shows that they're used directly. -DEPEND="dev-libs/gmp[cxx(+)] - =sci-libs/givaro-4.2* - =sci-libs/fflas-ffpack-2.5* - virtual/cblas - virtual/lapack - opencl? ( virtual/opencl ) - dev-libs/ntl:= - sci-libs/iml - dev-libs/mpfr:= - sci-mathematics/flint" - -# Use mathjax to render inline latex rather than requiring a working latex -# installation to generate bitmaps. -RDEPEND="${DEPEND} - doc? ( >=dev-libs/mathjax-3 ) -" - -PATCHES=( "${FILESDIR}/${P}-hardened-testfails.patch" ) - -# The --enable-openmp flag has been removed upstream, but we don't want -# openmp support to disappear after the package has been compiled with -# it, so we retain the USE flag and the toolchain check. -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - if use doc; then - # Avoid the need for a working LaTeX installation. MathJax does - # slow down the browser a bit but it also renders much more - # nicely than the latex-generated bitmaps would. - echo " - USE_MATHJAX = YES - MATHJAX_VERSION = MathJax_3 - MATHJAX_RELPATH = \"${EPREFIX}/usr/share/mathjax\" - MATHJAX_EXTENSIONS = ams - " >> doc/Doxyfile.mod || die - fi - - eautoreconf -} - -src_configure() { - # - # The --with-all flag includes, - # - # --with-givaro: used for finite fields, integer, etc. (required) - # --with-fflas-ffpack: small field dense linear algebra (required) - # --with-ntl: used for finite field, polynomial arithmetic (optional) - # --with-iml: used for fast integer/rational linear algebra (optional) - # --with-mpfr: not sure, doesn't seem to be used? (optional) - # --with-flint: used in algorithms/matrix-blas3 once (optional) - # --with-fplll: an fplll interface not directly used (optional) - # --with-doxygen: needed with --enable-doc to build them (optional) - # - # Some of these could be behind USE flags, but the ./configure output - # says that they're "not yet mandatory," which makes me think we might - # be overcomplicating things to make them optional right now. - # - econf \ - --with-docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --with-all="${EPREFIX}"/usr \ - --without-fplll \ - --without-archnative \ - $(use_enable doc) \ - $(use_with opencl ocl) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - if use doc; then - # These files are used for incremental doxygen builds but aren't - # part of the final output. Check on - # - # https://github.com/linbox-team/linbox/issues/252 - # - # periodically to see if this is pointless. - find "${ED}/usr/share/doc/${PF}" -type f -name '*.md5' -delete || die - find "${ED}/usr/share/doc/${PF}" -type f -name '*.map' -delete || die - fi -} diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest deleted file mode 100644 index 51a24aacbbdf..000000000000 --- a/sci-libs/minuit/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX minuit-5.27.02-asneeded.patch 1180 BLAKE2B b79677b75e4544ec3c154f149820a1ca0d26343982d21644f04ac9863290c66d4b8e6929dfa2bc49073e7ca7baef6b68a87bff4336c5dfdfd070e3bf3c169f7c SHA512 d5be2d60a39f3b7b2bf1afbf29a3fbc2d6d559c2be38141dc4871809a45b53ffbdbc12e39c6f887811c447b0e6c5ef47a32e4976cb78fa00d1b92b3ba3dd0e9a -DIST minuit-5.34.14.tar.gz 510005 BLAKE2B fbaba3d57198983c603cf03ebc6f07b6b32cab77b2833f2fa2dfe1fda7275863abb3966b535381edb4b3d9dbe181fb8255e08700ac443ea82debdf0bc20917b3 SHA512 96e520e0f9454f57a9529662612f444f60bcf63d21b7950b832cf3c670ee407ae78c9ffaf34eee728c0b68a4e39c347ea69121b4a51f1b2d33fd2176db88f720 -DIST mntutorial.pdf 263735 BLAKE2B f68b91bb2450371b52726974e7678fd7983f92dddf2ccde802a8081892804d5983302dcebbd05e70b94590436839613e5e4a81d035d5b208cc17efa4427cc863 SHA512 27d6fdc85fa190cd8e4e22d9ccac543005878718e24ececfbc1236266f50759390daf7ff50859dcfae18562a655955846460a56deeb4d44f23e77a629b1cddb1 -DIST mnusersguide.pdf 260072 BLAKE2B 750492928d27f85329b185c95043113363f270f0946d8e8b06ef167df6c8068f0fd8149f20d65066ecd6304a1ad4e86eea7d4b7988e0c0d7131ae26fcadf7a0c SHA512 6ed46923a798de7b1e5d9eb556684ece53fb85b57b18f4fd847de9f83251461fa69f841418272337e5284e061760c96798913b3f8e1d718a35a86f6e702d269b -EBUILD minuit-5.34.14.ebuild 1521 BLAKE2B 33d6d4a7f5beb18f35c777ecae46faa2a5774cf2cd769dc5b20541ddde66bf47d4259f5efa122bf74eec77f4700ac94f7e8e2d27c9a3f0933788395936cd7475 SHA512 d09f360e2687c57ecd06783fede6b483f8abc1073bd6e9eb0007bddeab1d9040ad41711cc413f7703ba0ab11fc2ae1d0ddad2d1d01af951ed2785df31567ae2c -MISC metadata.xml 624 BLAKE2B ed0b866f028dd0a957fb8e6db3a27cbd33fc2297c38ba152880a8dc39615b9418e338453a195172f94ea770c11c8d3c25688655c3efcd1512fe1aee0c4d883fd SHA512 2ca873197975adf6fa54b0c8c72df8b252d91a82b3603fe4ec2c142c6ab89aff64186f5b0d2c3c68d8944fc60297106389d2eae2b89d5916f3194039d23a5dbc diff --git a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch deleted file mode 100644 index e808a928f5e6..000000000000 --- a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch +++ /dev/null @@ -1,38 +0,0 @@ -This OpenMP library finding code is from ImageMagick's configure.ac - -http://bugs.gentoo.org/314095 - ---- a/configure.in -+++ b/configure.in -@@ -44,6 +44,20 @@ - CFLAGS="$CFLAGS $OPENMP_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" - -+dnl Find OpenMP library -+GOMP_LIBS='' -+if test "$enable_openmp" != 'no'; then -+ if test "${GCC}" = "yes"; then -+ AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,) # gcc -+ else -+ AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,) # solaris cc -+ AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,) # AIX xlc -+ AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,) # SGI IRIX 6.5 MIPSpro C/C++ -+ fi -+ LIBS="$GOMP_LIBS $LIBS" -+fi -+AC_SUBST(GOMP_LIBS) -+ - dnl files to be generated - AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile - doc/Doxyfile doc/Makefile test/Makefile test/MnSim/Makefile ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,6 +9,8 @@ - # The convenience library to be built. - lib_LTLIBRARIES = libMinuit2.la - -+libMinuit2_la_LIBADD = $(GOMP_LIBS) -+ - libMinuit2_la_SOURCES = \ - AnalyticalGradientCalculator.cxx \ - BasicMinimumError.cxx \ diff --git a/sci-libs/minuit/metadata.xml b/sci-libs/minuit/metadata.xml deleted file mode 100644 index f49fa95c6887..000000000000 --- a/sci-libs/minuit/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - Minuit provides a C++ library for non-linear optimization, - and parameter error estimation. Widely used in High Energy Physics, - originally as a fortran library, it has been entirely re-written from - scratch in C++. It is now included in ROOT-5 and higher. - This is the stand-alone version, quick to build and use. - </longdescription> -</pkgmetadata> diff --git a/sci-libs/minuit/minuit-5.34.14.ebuild b/sci-libs/minuit/minuit-5.34.14.ebuild deleted file mode 100644 index 108fecfc27e7..000000000000 --- a/sci-libs/minuit/minuit-5.34.14.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A C++ physics analysis tool for function minimization" -HOMEPAGE="https://seal.web.cern.ch/seal/snapshot/work-packages/mathlibs/minuit/" -SRC_URI=" - http://www.cern.ch/mathlibs/sw/${PV//./_}/${PN^}2/${PN^}2-5.34.14.tar.gz -> ${P}.tar.gz - doc? ( - http://seal.cern.ch/documents/minuit/mnusersguide.pdf - http://seal.cern.ch/documents/minuit/mntutorial.pdf - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc openmp static-libs" - -DEPEND="doc? ( app-text/doxygen )" -RDEPEND="" - -S="${WORKDIR}/${PN^}2-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-5.27.02-asneeded.patch ) - -src_prepare() { - default - rm config/m4/ac_openmp.m4 || die - mv configure.{in,ac} || die - - AT_M4DIR="config/m4" eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable openmp) -} - -src_compile() { - default - use doc && emake docs -} - -src_test() { - emake check - - cd test/MnTutorial || die - local t - for t in test_*; do - ./${t} || die "${t} failed" - done -} - -src_install() { - if use doc; then - # remove doxygen junk - find doc/html \( -iname '*.map' -o -iname '*.md5' \) -delete || die - HTML_DOCS=( doc/html/. ) - dodoc "${DISTDIR}"/mn{usersguide,tutorial}.pdf - fi - default - - docinto examples - dodoc test/MnTutorial/*.{h,cxx} - docompress -x /usr/share/doc/${PF}/examples - - if ! use static-libs; then - find "${D}" -name '*.la' -delete || die - fi -} diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest index 2804ece35f2a..383d5e4aed3f 100644 --- a/sci-libs/mkl/Manifest +++ b/sci-libs/mkl/Manifest @@ -10,14 +10,19 @@ AUX mkl-static-lp64-iomp.pc 342 BLAKE2B eddd6bba13426762a47a306469613e2010f5882b AUX mkl-static-lp64-seq.pc 331 BLAKE2B 5c234425fff2462f668fc8dd681a9c3d6d1c4e39f73ec4e5cb984eeeede1f84907ffcba3066b81912b7e8712d2dc154af5703d19d085b0f5a5fa3ab0290f2457 SHA512 b828a7513a491e852c65922159333418be026497d4b0b8b456607463af8b0d71da910e0eb4cd915f5a7eb1d0ff959c87bfc443df352f1f84ce9006530dd0af7f DIST intel-oneapi-mkl-2022.2.1-2022.2.1-16993_amd64.deb 202488238 BLAKE2B 9bea2cb85aebaa99eac17563e35e4a33e564e58b3e797ce97c140ee510870d7bccd5ffc138eea86a3c25de988a39b5ed06182cb87f103fd8c2dc772d1bd50b81 SHA512 21f2c8b9608fc942821624132aa905f2ec0863f6af9b8a02c166f88b41620ea4e66d1e6551f5da53e727103e9035f28018b12ee3bee33c76ea10be6a68c82748 DIST intel-oneapi-mkl-2023.0.0-2023.0.0-25398_amd64.deb 188781126 BLAKE2B f4db4f0e8111a01c697e656de30579c22cba3c34816c8399b1b4cffde33f4b636e837f6eceddc659c5c1d4f38984dec110e7362bb3d91eb521f1cfede64d399a SHA512 7f53a93151e5754219d3fa70722918c26f8f90b040f2587f85ce7e8dc1f73dadba5d138e01e67db4b9c76602d6e8502aa92645a0d10ddbcf5854bb85fcd2dbe6 +DIST intel-oneapi-mkl-2023.1.0-2023.1.0-46342_amd64.deb 181631354 BLAKE2B cd1380fd40505ebbd018e76f6727498ade9e63fd4db4167d38ada8819d264f01883afb00d6d3acd15981134f8c899f293afab9129637c359ba2e0b3cfa2e35ef SHA512 fcbe42bbd3446c7ac5d6986506e44976c8bd0e365ed829f20cc7662388bdd1c09ca1927bde49f8449539faa42eedbfbb7793603354fbfcd5cdc32e0e2564b4bf DIST intel-oneapi-mkl-common-2022.2.1-2022.2.1-16993_all.deb 23890 BLAKE2B 0287ac646a19e8a33b25cbef006cb98c410872fff2294a15d4e35dd55fc037b523c1923d99d2445a1959b6515ef4b6fdfa7243338c2d194b3c4bf4548949216c SHA512 362640c14713bc8186ea712bb6720311cce1dae6e775d7aade4c613a7a5708224507ff4fefa1081165fa366840f94f8ae73ee345699a4fee5cf7cd7607d9f94e DIST intel-oneapi-mkl-common-2023.0.0-2023.0.0-25398_all.deb 23930 BLAKE2B d4ea741816edbc69962cd3ac40bacfd200924212da47f30353ee60ef7ddad6a17453e51681e974cdc8f18355c538f1f3305e36a469860dc125f3c21e65fa0861 SHA512 3c190353b19ed32c13e702f45f453c37d62815aef306dc3bcf88faa20b5afe322c577e9129eafe2d1ace0238fde8d1f8fed04fcadd0ed2d6c43f8e5c46a76ce6 +DIST intel-oneapi-mkl-common-2023.1.0-2023.1.0-46342_all.deb 23886 BLAKE2B d166a924baa6014ae82fb4954c7a79eb3d854f7158ecf969f0a52f809ca8df863c9cec6c75e92b7122137e691c0d2bc71f4ed67006725af1ff9c6e66fed4625e SHA512 c51723be1522e9b1dcb41d30e46c9c1314a68f8cd76ee984c4b12e8206872d41360a9a28e89835225427f4ab2e637e4847fceaf6492cb18b18b22f32d124988d DIST intel-oneapi-mkl-common-devel-2022.2.1-2022.2.1-16993_all.deb 4688928 BLAKE2B 545641f68ba7b835859092242a60e065dd7bae8e538b27afaa1f7b266c6ce9aa5c0777b6ced7b8f3a35b70dbe6c6cbfad1db7c370a7a4f4478c8f23b4075bfd5 SHA512 275f267cf103b92ed0bdf56fdd55aee7c5ba5f42d2f7507abe1219aba72f325b9386c8e203a04d4a91020598d0d9cc82b0fc7abe22491c1103f44f3a31d42b2a DIST intel-oneapi-mkl-common-devel-2023.0.0-2023.0.0-25398_all.deb 4584320 BLAKE2B 4b172c61def3834d6c9c2ab82345c96fb474839af1abf56da280230fb69e4e01ebeabf5e9bed1dc394bc813595f3f6d0c104e9e7457de2366e17c6e83ce014b0 SHA512 9f300fd9950c734b10e846ccf21ff579dd761158c6e74f33acb77a8f636956c789f67b6757d9ff5e6ae7292782782556b158b413535b39fd39b80a45c634a017 +DIST intel-oneapi-mkl-common-devel-2023.1.0-2023.1.0-46342_all.deb 4661052 BLAKE2B 4cd1504982ce103a0654223e34e3c61fdb0b8759120cb8efb9750e5e0a728ea33b5c34d237bee07591ae32976ea96fa447b745a297061c54e6285a48dcdbec42 SHA512 877c758cc79d4b6239a0cf57b363f7a869b0794caf80f72eeeae9252544d8c2bafabd9f356f1b43839560d394218652e86a7983f30879523009bc144e5b2e814 DIST intel-oneapi-mkl-devel-2022.2.1-2022.2.1-16993_amd64.deb 183600754 BLAKE2B 94373a9d71625f71fb406d302eabed7800dc1b0e0ffef6268bf93abdccb8da4adb87643ebe73cd187fe1432b43e6de4eee4b716bb67a483c862e1beef0db486a SHA512 a259580266798e16b6fe6195cfacb1cdd9ae519c86945e7df29b7eff344fbfb238b0126231a99d2190cdbdba6340dce3f40574f443efd09b4955c86260d331da DIST intel-oneapi-mkl-devel-2023.0.0-2023.0.0-25398_amd64.deb 171354314 BLAKE2B 27ddc4f1fe09d688e2593e30d1de49505ccf5ac3d8ce50105f29ed451cf402df064419e3795b7f7aeed499fb6fd3191cce0099fa85a20fe90e06cc82415b1c79 SHA512 2688e1ca91bfce33026fd5853d04aa510318d2e6f154755afa2103ba797119b0e2c19718e1180b96fce89d704b9b8d5d3995788320296861b498e18420470572 +DIST intel-oneapi-mkl-devel-2023.1.0-2023.1.0-46342_amd64.deb 171338710 BLAKE2B 7f804f88e88c1bc28c0b2470a703815e33e44fe6e4dacd179095c430a46db34f97f863b3169b96e74f67e14c285f3adf99ff04c60c40e495e17f2a947fc03387 SHA512 1ef5cb3a161b3d2fcf6c1e4a13e696abc8756a9d05723fd7d9c514bf2469f787e9e56f8696fbad25d3102a6d84063fc61daae6b514188c021f5e6b00d67a8dd9 DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7 -EBUILD mkl-2020.4.304.ebuild 6674 BLAKE2B abe1ed5d32ba1114aee0aa33c4b0259f1ce6f241dbfc146f344903ea5d815e81b4059a54df0ab2b934b3dd672f1471666565989981ed54bbf15283411e7bd8c1 SHA512 3deaa4858df6b8ddb58755ddcbfd62d11ea98af5b38597cfa916b80cf59b23fe043dd667b9b6c2f1d458545579002f07d375a484e0896aa7f6ef5572021baeae -EBUILD mkl-2022.2.1.16993-r1.ebuild 4912 BLAKE2B dacb260aa27721d07f0090366aa7f1472d44e4bbcd805261fbc3ee19c4532d2d407d9c6beb02beab5b8075105cb2ac463fe3fd40e79438cbb924e4aec97c4797 SHA512 ef77d05f773bda971ba5e299caa8341d7dfbd510579f8bc28e1bd169da93f71fbee8bc192237be84598d32dcf17e4ba08d944d00936d04e84bcdd1dc64aeae77 -EBUILD mkl-2023.0.0.25398.ebuild 4950 BLAKE2B c3cacb5731d55a6233fe86d5751f459edc863c546b2944421a3dac97d60eff57bcde0873e1abb265385322434d45cfca93090d07a09c4b9d92ec6b38753d51cb SHA512 a9b6aeaf662d778fab1aeb92457e57f500982e2ed327f9ed3ce6e8921e7b0e1e48493a5b682b0502501fc2743b4b369c64dfbafd4959436e3716d868a936b1f7 +EBUILD mkl-2020.4.304.ebuild 6677 BLAKE2B 4bb2986b2421f7304ba54c8a42695df780216a6f48c9c619a93c8da98f4746ab18ecb7697b17dbd6a3e61d96ae49d60c9808281d1d5903d7ad4820ab46547da5 SHA512 7e654affd9f8f6c3358df1da3de0f16a7fa5fc27b9ef0b402fb812a692a176577ebd2e832944ab6aaada8989f39604fe8ccb58174ba96362c2410549994dc6ce +EBUILD mkl-2022.2.1.16993-r1.ebuild 4915 BLAKE2B fd041dac30b747447f6b7ac42e8224ad4cc927a96f9e4f6d102d2c2847f52d09ff121791d06364480fc71b2567cfb725b8eff7e845b9489820976030c655a19a SHA512 89e2d3e7f07ff05997bfbd380f7dc1b237aed3d1734db13972fab49f193131d610703ab0b96205c537af33df2262eedb1567cd54f37c6d6ab07ab93de033b9ae +EBUILD mkl-2023.0.0.25398.ebuild 4953 BLAKE2B 54fe6406a0b48c86f34f374188180da5d5833cee48cafc90fe31314493b150d42fbb27387e50179ab9896779df9b13ca2ee589bcf808edb275015a0fe3917ad8 SHA512 c5f7f0ada8cb2e8aed86f660ec87b23cc30f0dc78757022a2362cf1cf6a2d6f5b461a20c0d398c5033ac17ca41445bbc7b8eaac60257666ee6779e7ad0f7dee3 +EBUILD mkl-2023.1.0.46342.ebuild 4962 BLAKE2B b27595d98a8aad020d3b23cf7625541a5ab4b9da79d90e8a2e36d386943e32c07ab77a25c6c27a165224af0f8a1888d1b2c61f229beb75812eac8cd6dd04c999 SHA512 766cafab7b74d36d5fe72b43ec04d265604d098fdd7ead96c1de59dad31d21e896c45742ec0ef2d3969659929a7e92e3d38ff7cc07d4219ac260dd37835ff1f0 MISC metadata.xml 799 BLAKE2B 98a214e275d4d4930086f0dd1695c4d5dfd44da3399f77cc1f839e403423050c6d20f7b38892bd9ff96e5e8578a4c83ff8979e6505dfb67417c6dbb40fe59500 SHA512 3b609c66ec90f057cb16c6721e6a5bfd6a3522a1ff2bba47e2a77212e26f06fb850be8b178a0a2020f751882ddd32fda082879c7f5a9b008c041ce493f55d28a diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild index daf81b2b41ea..b5764fafad09 100644 --- a/sci-libs/mkl/mkl-2020.4.304.ebuild +++ b/sci-libs/mkl/mkl-2020.4.304.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,7 @@ RDEPEND=" sys-libs/libomp[${MULTILIB_USEDEP}] " # bug #801460 -BDEPEND="app-arch/xz-utils[extra-filters]" +BDEPEND="app-arch/xz-utils[extra-filters(+)]" QA_PREBUILT="*" QA_TEXTRELS="*" diff --git a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild index 2db42ce2ecab..08673a4b5283 100644 --- a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild +++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ RDEPEND=" sys-libs/libomp " # bug #801460 -BDEPEND="app-arch/xz-utils[extra-filters]" +BDEPEND="app-arch/xz-utils[extra-filters(+)]" QA_PREBUILT="*" QA_TEXTRELS="*" diff --git a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild index 159969761e31..55c1ca5a70c6 100644 --- a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild +++ b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ RDEPEND=" " # bug #801460 BDEPEND=" - app-arch/xz-utils[extra-filters] + app-arch/xz-utils[extra-filters(+)] app-eselect/eselect-blas app-eselect/eselect-lapack " diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild new file mode 100644 index 000000000000..024336ac92b8 --- /dev/null +++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit unpacker + +DESCRIPTION="Intel Math Kernel Library" +HOMEPAGE="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html" +SRC_URI=" + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb +" +S="${WORKDIR}" + +LICENSE="ISSL" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="strip" + +# MKL uses Intel/LLVM OpenMP by default. +# One can change the threadding layer to "gnu" or "tbb" +# through the MKL_THREADING_LAYER env var. +RDEPEND=" + app-eselect/eselect-blas + app-eselect/eselect-lapack + dev-cpp/tbb + dev-libs/opencl-icd-loader + sys-cluster/mpich[fortran] + sys-libs/libomp +" +# bug #801460 +BDEPEND=" + app-arch/xz-utils[extra-filters(+)] + app-eselect/eselect-blas + app-eselect/eselect-lapack +" + +QA_PREBUILT="*" +QA_TEXTRELS="*" +QA_SONAME="*" + +src_prepare() { + default + # Drop conda stuff + rm -r opt/intel/oneapi/conda_channel || die +} + +src_install() { + # Symlink pkgconfig and cmake files + pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig" || die + for file in *.pc; do + dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig/${file}" "/usr/share/pkgconfig/${file}" + done + popd || die + pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl" || die + for file in *.cmake; do + dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl/${file}" "/usr/$(get_libdir)/cmake/mkl/${file}" + done + popd || die + + # Symlink files in locale directory + pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die + for file in *; do + dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US/${file}" "/usr/share/locale/en_US/${file}" + done + popd || die + + # Move everything over to the image directory + mv "${S}/"* "${ED}" || die + + # Create convenience symlink that does not include the version number + dosym "$(ver_cut 1-3)" /opt/intel/oneapi/mkl/latest + + dodir /usr/$(get_libdir)/blas/mkl + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3 + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3 + dodir /usr/$(get_libdir)/lapack/mkl + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3 + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so + dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3 + + newenvd - "70intel-mkl" <<-_EOF_ + MKLROOT="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)" + PATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64" + # we need to duplicate it in ROOTPATH for Portage to respect... + ROOTPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64" + LDPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64" + _EOF_ +} + +pkg_postinst() { + local libdir=$(get_libdir) me="mkl" + + # check blas + eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi + + # check lapack + eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me} + local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) + if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then + eselect lapack set ${libdir} ${me} + elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]." + else + elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]." + elog "To use lapack [${me}] implementation, you have to issue (as root):" + elog "\t eselect lapack set ${libdir} ${me}" + fi +} + +pkg_postrm() { + eselect blas validate + eselect lapack validate +} diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index abec6675028b..55b921410e2d 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -1,5 +1,5 @@ AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d -EBUILD netcdf-4.9.2-r1.ebuild 2581 BLAKE2B 4b867ebfdad081fa37b066cb6c5cb027a44b26ff99c4020f6f8e68988c6b359134210db5decc8541de1d4bab3211dec3bd06c33983cc3be44e52d4ec2328b7e2 SHA512 d9c83ea652c8596cd96a11d08e72f95a4ced271e5b274f2743d53ba72014558b9d9895bed0e53f2dabaa6ea0555071b7a6cecf4e8f058a9730c96f7e2295dbad +EBUILD netcdf-4.9.2-r1.ebuild 2580 BLAKE2B ea72380f73e38805a163e8596ac9d7509ee624bd8fd57273129d2d4f6b3da9442902b0f594a5fcc603d42a4a391830859b583b9de7f60cb463360a5b2849d0f4 SHA512 108f46f7e579f4404dddc3d928d8a331752028027831b14ef4f7ffe2abefb065876e7ded299ed36d3de8c84d510ed85d120b7456b1efb20001c52b7142cdfefd EBUILD netcdf-4.9.2.ebuild 1654 BLAKE2B 659bd08ff2776a86da5b6496cf9fc92e5b0bf8bd356f56dcfd6d1ea8ee5b6bf8bd2c51c19ccd035415b43c29bd5ddd3a41a5602a920252347e6abc1b196166b5 SHA512 a4ed28c724d7b6242fb2a48ebc667a5a4fc8ce57bf38ace9986a73fb9e32d5ba30c61f0bf66eca47cc839d2ed25af5b2d11553a47648f56d5d87ee43da90499d MISC metadata.xml 1131 BLAKE2B 2578a44e7142d8d072820f31db58de4e5550e4e9d1b3fb7d420f7d41d810580b98757d7fead672e28ea615820fa3e7f27738fe6a04c4201250596f8b37533271 SHA512 77b14836750cc93bbc38613c00ef125ebc89705bcc29b68823675662fdaeb1ddb43d6c0023a71920e23e458bd10c55e89248676fa7994d6d15992c9fdc2bce38 diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild index 45758fb6ef38..56d9ef1d3d0e 100644 --- a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild +++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV} LICENSE="UCAR-Unidata" # SONAME of libnetcdf.so SLOT="0/19" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd" RESTRICT="!test? ( test )" diff --git a/sci-libs/o2scl/Manifest b/sci-libs/o2scl/Manifest deleted file mode 100644 index a997fc3a1e49..000000000000 --- a/sci-libs/o2scl/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST o2scl-0.920.tar.gz 34498666 BLAKE2B de269d1d6d329786d34dcbf84b6cb89d5bfae709ff1e0116455dbf8cee9e66d45b2a66086ca467037c572a8495ad198a23836861914c681050471810dda00354 SHA512 a80c959b76d15473e206f1caac496607af254f0617f7a18d13bd9732861b6c51f5db8ca3ff6866bb8d0ea70865d4ac94cb972e0a0c158f19034667340341467c -EBUILD o2scl-0.920.ebuild 1723 BLAKE2B fc99b6db606efff8a4666048a3cd2f793341c23309113f1cfed407156defb5bd92e5bb8284309614899607de5ded09282ca3202929f8b547cb720c23212f2979 SHA512 c0978da228f15a5953d19a54a3972cf121ab74ca41cd03a43745a0522b6fb0e3127c22695bbfc6c891504bc55bcc10d544075dd04601fa0115b1a36162248231 -MISC metadata.xml 917 BLAKE2B 853243ea026afa409c8be80040f9a97e6b74f5126168f8df4e83367ace9a26ff444324461097d040b187f4f8b22cbf52fd9c9993833b39e13d16b5926f57f490 SHA512 8198e119295aca7034964f2d239dddfb0711240ca2658656eb9ba90bc363a31f7e02eb239130bf54eaa670fa81feb20072b7e11acb69e3d3189561318f506e66 diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml deleted file mode 100644 index bfbde3f72f12..000000000000 --- a/sci-libs/o2scl/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - O2scl is a C++ class library for object-oriented numerical - programming. It includes classes based on numerical routines from - GSL and CERNLIB and two sub-libraries: thermodynamics of ideal and - nearly-ideal particles with quantum statistics and e quations of - state for finite density relevant for neutron stars. - </longdescription> - <use> - <flag name="armadillo">Build matrix manipulation with <pkg>sci-libs/armadillo</pkg></flag> - <flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag> - </use> - <upstream> - <remote-id type="github">awsteiner/o2scl</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/o2scl/o2scl-0.920.ebuild b/sci-libs/o2scl/o2scl-0.920.ebuild deleted file mode 100644 index b82c2a9bcc19..000000000000 --- a/sci-libs/o2scl/o2scl-0.920.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Object-oriented Scientific Computing Library" -HOMEPAGE="https://web.utk.edu/~asteine1/o2scl/" -SRC_URI="https://github.com/awsteiner/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="armadillo debug doc examples eigen fftw gsl hdf5 openmp readline static-libs" - -RDEPEND=" - dev-libs/boost:= - >=sci-libs/gsl-2:0= - virtual/cblas:= - eigen? ( dev-cpp/eigen:3 ) - armadillo? ( sci-libs/armadillo[lapack] ) - fftw? ( sci-libs/fftw:3.0= ) - hdf5? ( sci-libs/hdf5:0= ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && ! tc-check-openmp; then - ewarn "OpenMP is not available in your current selected compiler" - die "need openmp capable compiler" - fi -} - -src_configure() { - use debug || append-cppflags -DO2SCL_NO_RANGE_CHECK - econf \ - --enable-acol \ - $(use_enable armadillo) \ - $(use_enable eigen) \ - $(use_enable fftw) \ - $(use_enable gsl gsl2) \ - $(use_enable hdf5 hdf) \ - $(use_enable hdf5 partlib) \ - $(use_enable hdf5 eoslib) \ - $(use_enable openmp) \ - $(use_enable static-libs static) -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - rm -r "${ED}"/usr/doc || die - if use doc; then - dodoc -r doc/o2scl/html - docompress -x /usr/share/doc/${PF}/html - fi - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 6978beae5e2f..ffa69d160e36 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,4 +1,6 @@ AUX onnx-1.15.0-hidden.patch 511 BLAKE2B 857a4ff9597a25430e2236c2d9de47c1203e630a4adfe8e4cdb72ddfb928f0327e2a625ad91e936e4d3f71bc4aa135bbd15abcf348958238075d356d47d3291b SHA512 a4dbcbae79af1ef1edc8ec8aa27eb0303c1a52baf7db74e70f2d1e6a35db7d5ed2205f7f10f34fdcd3ac536b029edf749b9eb8f7926ac2b620ac7a4b59884182 DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a SHA512 ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5 +DIST onnx-1.16.1.tar.gz 12428832 BLAKE2B 15a7db2fa263914957c671bd8e94eb8b80afeba0b396e8b54f8fb2deda2965885055efae7a6f6e402eb085b5795025020f650132023ba3d4df1f395d99ec353c SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4 EBUILD onnx-1.16.0-r1.ebuild 1472 BLAKE2B 9ad73dba0ab42f4befaea9e49b497fae33b642ee350e3612bd830e4ab9e30452a82905f8fd9cb6bfde28663b2c173b1b8cea93e38cde264d99d259bd7fb82868 SHA512 3e7f0caae489f2cd95db713f5d30de754069679dbb8fdd7d1ce3ae7d1a031cb041b507acaeb1dd1322fc45405ef0588a1aad13f140b5ba1b472035b71824296f +EBUILD onnx-1.16.1.ebuild 1472 BLAKE2B 9ad73dba0ab42f4befaea9e49b497fae33b642ee350e3612bd830e4ab9e30452a82905f8fd9cb6bfde28663b2c173b1b8cea93e38cde264d99d259bd7fb82868 SHA512 3e7f0caae489f2cd95db713f5d30de754069679dbb8fdd7d1ce3ae7d1a031cb041b507acaeb1dd1322fc45405ef0588a1aad13f140b5ba1b472035b71824296f MISC metadata.xml 404 BLAKE2B 363f1790f0dd2eace0368d7eb1875c166ba6dd0b2514232050f2f1813ccba854b4f8e58e22a329792126188f06d21bf87436c1dcc10d68b018f7abc8eb8ec3e9 SHA512 6a80de77d763a261cafee9cd69337de5282fa39772a1d2a82c3d954d29221596036346339926a124f9df9b261050d17b58d004cdd01ff2f57347379e9df2e45f diff --git a/sci-libs/onnx/onnx-1.16.1.ebuild b/sci-libs/onnx/onnx-1.16.1.ebuild new file mode 100644 index 000000000000..16f073d9b4d3 --- /dev/null +++ b/sci-libs/onnx/onnx-1.16.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 cmake + +DESCRIPTION="Open Neural Network Exchange (ONNX)" +HOMEPAGE="https://github.com/onnx/onnx" +SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="disableStaticReg" +RESTRICT="test" + +RDEPEND=" + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-libs/protobuf:= +" +DEPEND="${RDEPEND} + dev-cpp/abseil-cpp" + +src_prepare() { + eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch + cmake_src_prepare + distutils-r1_src_prepare +} + +python_configure_all() +{ + mycmakeargs=( + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON + -DONNX_USE_LITE_PROTO=ON + -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) + ) + cmake_src_configure +} + +src_configure() { + distutils-r1_src_configure +} + +src_compile() { + mycmakeargs=( + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON + -DONNX_USE_LITE_PROTO=ON + -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) + ) + CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile +} + +python_compile_all() { + cmake_src_compile +} + +python_install_all() { + cmake_src_install + distutils-r1_python_install_all +} + +src_install() { + distutils-r1_src_install +} diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest index 4d0281f1047a..683517e465a6 100644 --- a/sci-libs/openlibm/Manifest +++ b/sci-libs/openlibm/Manifest @@ -1,5 +1,8 @@ +AUX openlibm-0.8.3-stack-protection.patch 2065 BLAKE2B 213710329df83d08798cea61d952e6ced7218bad7e80eb9ee8004ccbfaf85a27fc70fb1ac4f6f5b313b47453be1197567296c8cca23fcd65ad037599ff0b17a7 SHA512 7e750cdb2fe9871b1e83291ffac5d255a73f2f577b05f3a3dcb35ee919c38fa26980416d38352805b1b32f91de3b7bcba8fab0f0757bb506786ddbdeb4429739 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799 DIST openlibm-0.8.0.tar.gz 367130 BLAKE2B e516fee18203040b8f3cdffab10c4ca22df638551b420ec7e679ff373221973a013c93520b29395c61c8ef0f0f6c87516c1d4a9885c3bbb5e8cae8900efee6ea SHA512 336dfac1fd4ab6ce256aa0129a211c3556eac46d2e775e5cec9626dc5bbcb4d5e65c86617d72e531694e8c8e6320a0fabc76600a02b0ac9f1d652774d0a94440 +DIST openlibm-0.8.3.tar.gz 374991 BLAKE2B 91474b5c9480753dafb2f85521a8909eaa00febc871bd71d6ffecfd1001200ce66c66c43f4f5738215f04bc109035dcceb2a9f6319e8b9405e6cab65e802aafb SHA512 1c6969e6e3117ddc066697318e43cf42d170750cb85cbed6013eb29d7513d5998eeffbff4a658d222cf637977cb7dca34b7a15814f8870f4e36e880673d757c0 EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862 -EBUILD openlibm-0.8.0.ebuild 890 BLAKE2B 452fc8fa61be18602db28ae60890f7aa87066b8f545255eb7560293349107dbe649846876758d82e1c8b553cfb8bf05d20c0cbba60f64f19933a36e2901a72e4 SHA512 6681605b4ba916b934be47c37cdfab8e80896212a6dcf8d26423ddbdaac6c0cd90270fd8f6631a8fdfb545fd198130d81eb6ac045a2e55f567746f2273985cbc +EBUILD openlibm-0.8.0.ebuild 908 BLAKE2B f966b0c1ce4c6437061fc01caf15c79634350222865e7bea12da31897805bb56d50c43a75fa63060bf0a369b2c4ff394ce559ae0a26a171f9279859662ec0e8c SHA512 a62983295d2e90209e97b311e95d67e93bb2203d66bb9d9b1ba5aa00c034ab4b082bd34dd1fa25b5b2c9abfcbfed98938bf22aa278cfd3e494e17a02716f8f4d +EBUILD openlibm-0.8.3.ebuild 1141 BLAKE2B 702a48c1fe0feeee94bc02f649e1a60f3185e43981954dcd92b2ccb7dbcf2d98da6c1b16601b13265ea54577887c9621eab2124255836449ef3cb4c4ef219474 SHA512 63dcf21b73d435716f436cf3e8e849b1b0978510908c945507fe28b59e87f10b287dc4458e1741b7006c4971b4c628ba8531088ce77712d66b53b20686709f23 MISC metadata.xml 785 BLAKE2B 160415de6f1dd61dfe42488a2aaf716bb6ecb00396ae541c8b385116fb0b5017bc546fdcdd6394ce5c547cd85e7ccf94b7996128355ce3fa9fc7b17478c2949d SHA512 cdc602bce059702ad03d57a67ad9e2897fdcf999fd2d664e76293ddd22741817a042abafd6603c424839780d30b647a82901c468a5d55dc1794fdafd2a281b8c diff --git a/sci-libs/openlibm/files/openlibm-0.8.3-stack-protection.patch b/sci-libs/openlibm/files/openlibm-0.8.3-stack-protection.patch new file mode 100644 index 000000000000..91e28b238624 --- /dev/null +++ b/sci-libs/openlibm/files/openlibm-0.8.3-stack-protection.patch @@ -0,0 +1,73 @@ +# https://github.com/JuliaMath/openlibm/pull/307 +From 435459ec45b368e618578d2a526edd0c51709ad1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakov=20Smoli=C4=87?= <jsmolic@gentoo.org> +Date: Mon, 5 Aug 2024 00:02:28 +0200 +Subject: [PATCH] Add stack markings for GNU to fmod assembly files + +This adds stack markings to the missing fmod .S files, otherwise the +final libopenlibm object file gets marked with an executable stack. + +Output when compiling from source on Gentoo Linux: + +``` + * QA Notice: The following files contain writable and executable sections + * Files with such sections will not work properly (or at all!) on some + * architectures/operating systems. A bug should be filed at + * https://bugs.gentoo.org/ to make sure the issue is fixed. + * For more information, see: + * + * https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart + * + * Please include the following list of files in your report: + * Note: Bugs should be filed for the respective maintainers + * of the package in question and not hardened@gentoo.org. + * RWX --- --- usr/lib64/libopenlibm.so.4.0 +``` +--- + amd64/e_fmod.S | 5 +++++ + amd64/e_fmodf.S | 5 +++++ + amd64/e_fmodl.S | 5 +++++ + 3 files changed, 15 insertions(+) + +diff --git a/amd64/e_fmod.S b/amd64/e_fmod.S +index 37cae39..d2c8ecd 100644 +--- a/amd64/e_fmod.S ++++ b/amd64/e_fmod.S +@@ -49,3 +49,8 @@ ENTRY(fmod) + fstp %st + ret + END(fmod) ++ ++/* Enable stack protection */ ++#if defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/amd64/e_fmodf.S b/amd64/e_fmodf.S +index 197892e..b045e73 100644 +--- a/amd64/e_fmodf.S ++++ b/amd64/e_fmodf.S +@@ -19,3 +19,8 @@ ENTRY(fmodf) + fstp %st + ret + END(fmodf) ++ ++/* Enable stack protection */ ++#if defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/amd64/e_fmodl.S b/amd64/e_fmodl.S +index 64be92f..cab539d 100644 +--- a/amd64/e_fmodl.S ++++ b/amd64/e_fmodl.S +@@ -45,3 +45,8 @@ ENTRY(fmodl) + fstp %st(1) + ret + END(fmodl) ++ ++/* Enable stack protection */ ++#if defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +-- +2.44.2 + diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild index 3d2362897851..df09fa8e2592 100644 --- a/sci-libs/openlibm/openlibm-0.8.0.ebuild +++ b/sci-libs/openlibm/openlibm-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ IUSE="static-libs" LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm SLOT="0/4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" src_prepare() { default diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild new file mode 100644 index 000000000000..5bcb22cdbeda --- /dev/null +++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="High quality system independent, open source libm" +HOMEPAGE="https://github.com/JuliaLang/openlibm" +SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +IUSE="static-libs" +LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" +# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm +SLOT="0/4" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${FILESDIR}"/${P}-stack-protection.patch +) + +src_prepare() { + default + sed -e "/^OLM_LIBS :=/s/^/#/" -i Makefile || die + if ! use static-libs ; then + sed -e "/install: /s/install-static//" -i Makefile || die + fi +} + +src_compile() { + # Build system uses the riscv64 arch variable + use riscv && export ARCH=riscv64 + + emake \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + FC="$(tc-getFC)" \ + AR="$(tc-getAR)" \ + LD="$(tc-getLD)" +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ + libdir="${EPREFIX}/usr/$(get_libdir)" install + dodoc README.md +} diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest index fcee52f1d4eb..9d181f66c9bc 100644 --- a/sci-libs/pastix/Manifest +++ b/sci-libs/pastix/Manifest @@ -1,11 +1,8 @@ -AUX pastix-5.2.3-MPI-3.0.patch 5490 BLAKE2B 8e77cbdbf0857909d6e70570fe27cfeb977e7d3380298ad30e42c8194dc79241e16cb378d2a8da065dd142704530289d6508f87800e171bd6865877d802584cf SHA512 bd142ea25596d28d4962154fd24a4d66b4ab0cc2de9e662ad89e56695ca3e078d79848757efa2f02a3e1920c133d0c9d0b697efd5d9aef3008e07b3c91b16289 AUX pastix-6.0.3-cmake-examples-optional.patch 5248 BLAKE2B eb6e08274d2bbac53c4fe02497880f61a83eb357dc95ec6ea1049322556010a0e5514d8c6d0f273b00b7b46047394edf2108ee14ef0cde65f99ebe1eb2160786 SHA512 00c214c45cf4a1c06ca4dcf3cffde9915de67f2656b0712ca23f6ff2c4aa29845f37fd7940d011fbbba170d3a47b6d74ec6cb165474c2eb30a292374e0d52953 AUX pastix-6.0.3-cmake-installdirs.patch 13450 BLAKE2B 9c7535b4074496a97d0673fad73e7729f34c71ad992441fa2dbc1d8801b6cf1d74773872b71fad5dec8f21ac26065abf0e7de12cbec2c9a52098be6368dd7b31 SHA512 89de15236d23fb8e7f9d064789e2a6314a615803a41deeb08f22f4ee5aea92263da939ce967310fd93a5cd89051c0f0a0d3df71b0ea4968cefbec3c5cf5185fe AUX pastix-6.0.3-cmake-python-optional.patch 1861 BLAKE2B 5097879c1481ce7514903a182007d0d87a9e59a350f72ebba21b5719e893308617416c3661058744f7a83009cb6c7d8949ba6e57966e0a798aa4b1c96aa1f928 SHA512 ecff70d902a4424b4ee996b563e54b7190ee1d3324ef7079fafdef2f23abbc9a18899f827156ed4145a3d977f5b6c980acafb96f479be693b6658f7d21e5cced AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c3153eac0cfa5150918db2ae019d8defda1689dd41d584bbd866f4016f3f98102c61a4bb5a18419f88bfc197cd3659afb95311 SHA512 58aebfea042443daf75fb155c39d44e5a2d4ffdc27043b66a6c6089613363b0613ab8ac9e11cde1b749e87ec160aaa0355a0c3a2bb01fbedb43c4d28951e7747 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544 -DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95 -EBUILD pastix-5.2.3.ebuild 3456 BLAKE2B e9e4935b9eb71023e9a747542fdcd3013c22eea43bc4d6ff0382418da05fe5b352d55be3d517514a1e2abbf46168fb741f9c42ed6d64e5446d6dc77dcd513260 SHA512 4759301acea56b4197dbd098878909521cc9336c0406a4dc0929d5bf4c9c428cbca65016d6c4fa7a340dd46a76cc1b75d4f7881b82ec2ab493f237e67354abd0 -EBUILD pastix-6.0.3.ebuild 2448 BLAKE2B 04f269eb2926adaea198382188b0d8eeef9dab4d6b4a7283ee551cc3c784039ad5a659f52e488ae9ac2bde3f262c16f4301c355c81837cc5f52bae76aff164e7 SHA512 b5b3a23aa9c88638562af1c4373ca478dd7aa28a121b97f1f77504a0e1c17a7461baadf92a0bd2bc3d71931d5ac4d7f590de2dc0f60eaea432a65c903dbe4c88 +EBUILD pastix-6.0.3.ebuild 2448 BLAKE2B 8d8e566725bb16d679c646e4fe82cd61dbfbe26cbd7be81ac36cade527762aba89a9b75daf836e8a32bb143c8d20828d367391815995d7d20ed0f49b8173aee3 SHA512 f447c38370e2ca95d70186fb5787cc2f2982b55d2b000943a4f98ec04d0f3bed9376cbff8bedd7ee7c162e7f10c69d0eb70fab20bf4c94a562b685916e240ad7 MISC metadata.xml 1318 BLAKE2B fbb4b85fdfda84ea9b836c615710c7edab402a579945cdda7e2df80bfc5f0c68065509de5ddf19ce3cb164c12f1adee899b73167f074294797482eb208f0949a SHA512 ba29b7c771890999442726d6863e86c12e9994bb020d4b5ee81638fa079a05985e4f721436362c4b48aab901f6414e92a713b594178ec93682134356dac08a55 diff --git a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch deleted file mode 100644 index d86ec5b78416..000000000000 --- a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch +++ /dev/null @@ -1,139 +0,0 @@ -https://bugs.gentoo.org/692742 -rename MPI 1.0 to 3.0+ functions: -- MPI_Address -> MPI_Get_address -- MPI_Type_struct -> MPI_Type_create_struct - ---- a/common/src/nompi.h -+++ b/common/src/nompi.h -@@ -127,9 +127,9 @@ - #define MPI_Start(request) - #define MPI_Startall(count, array_of_requests) - #define MPI_Type_contiguous(count, oldtype, newtype) --#define MPI_Type_struct(count, array_of_blocklengths, array_of_displacement, \ -+#define MPI_Type_create_struct(count, array_of_blocklengths, array_of_displacement, \ - oldtype, newtype) --#define MPI_Address(location, newtype) -+#define MPI_Get_address(location, newtype) - #define MPI_Type_commit(datatype) - #define MPI_Type_free(datatype) - #define MPI_Request_free(request) ---- a/sopalin/src/sopalin_sendrecv.c -+++ b/sopalin/src/sopalin_sendrecv.c -@@ -1300,10 +1300,10 @@ - thread_data->gtaboffs[packnbr] = FANIN_INFOTAB(t); - thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t); - #else /* NO_MPI_TYPE */ -- CALL_MPI MPI_Address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1])); -+ TEST_MPI("MPI_Get_address"); - #endif /* NO_MPI_TYPE */ - - /* Add other contribution for the same task */ -@@ -1410,12 +1410,12 @@ - thread_data->gtaboffs[packnbr] = FANIN_INFOTAB(t); - thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t); - #else /* NO_MPI_TYPE */ -- CALL_MPI MPI_Address(FANIN_INFOTAB(t), -+ CALL_MPI MPI_Get_address(FANIN_INFOTAB(t), - &(thread_data->gtaboffs[packnbr])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(FANIN_COEFTAB(t), -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(t), - &(thread_data->gtaboffs[packnbr+1])); -- TEST_MPI("MPI_Address"); -+ TEST_MPI("MPI_Get_address"); - #endif /* NO_MPI_TYPE */ - - if (queueSize(sendqueue)) -@@ -1508,10 +1508,10 @@ - TEST_MPI("MPI_Rsend"); - # endif - #else /* NO_MPI_TYPE */ -- CALL_MPI MPI_Type_struct(2*(packnbr/2+1), thread_data->gtabsize, -+ CALL_MPI MPI_Type_create_struct(2*(packnbr/2+1), thread_data->gtabsize, - thread_data->gtaboffs, - thread_data->gtabtype, &newtype); -- TEST_MPI("MPI_Type_struct"); -+ TEST_MPI("MPI_Type_create_struct"); - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); - # ifdef TEST_ISEND -@@ -1602,15 +1602,15 @@ - (long)me, (unsigned int)(intptr_t)BTAG_COEFTAB(t)); - - #ifndef NO_MPI_TYPE -- CALL_MPI MPI_Address(BTAG_BTAGTAB(t),&(taboffs[0])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(BTAG_BCOFTAB(t),&(taboffs[1])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address((void *)BTAG_COEFTAB(t),&(taboffs[2])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(BTAG_BTAGTAB(t),&(taboffs[0])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(BTAG_BCOFTAB(t),&(taboffs[1])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address((void *)BTAG_COEFTAB(t),&(taboffs[2])); -+ TEST_MPI("MPI_Get_address"); - -- CALL_MPI MPI_Type_struct(3,tabsize,taboffs,tabtype,&newtype); -- TEST_MPI("MPI_Type_struct"); -+ CALL_MPI MPI_Type_create_struct(3,tabsize,taboffs,tabtype,&newtype); -+ TEST_MPI("MPI_Type_create_struct"); - - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); ---- a/sopalin/src/updo_sendrecv.c -+++ b/sopalin/src/updo_sendrecv.c -@@ -347,12 +347,12 @@ - tabtype[0] = COMM_INT; - tabtype[1] = COMM_FLOAT; - -- CALL_MPI MPI_Address(infotab,&(taboffs[0])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Type_struct(2,tabsize,taboffs,tabtype,&newtype); -- TEST_MPI("MPI_Type_struct"); -+ CALL_MPI MPI_Get_address(infotab,&(taboffs[0])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Type_create_struct(2,tabsize,taboffs,tabtype,&newtype); -+ TEST_MPI("MPI_Type_create_struct"); - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); - # endif /* NO_MPI_TYPE */ -@@ -974,8 +974,8 @@ - - tabtype[0] = COMM_INT; - -- CALL_MPI MPI_Address(infotab,&(taboffs[0])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(infotab,&(taboffs[0])); -+ TEST_MPI("MPI_Get_address"); - - /* If schur, send empty data */ - if ((sopalin_data->sopar->iparm[IPARM_SCHUR] == API_YES && -@@ -988,12 +988,12 @@ - for (iter=1; iter<UPDOWN_SM2XNBR+1; iter++) { - tabsize[iter] = size; - tabtype[iter] = COMM_FLOAT; -- CALL_MPI MPI_Address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter])); -+ TEST_MPI("MPI_Get_address"); - } - } -- CALL_MPI MPI_Type_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype); -- TEST_MPI("MPI_Type_struct"); -+ CALL_MPI MPI_Type_create_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype); -+ TEST_MPI("MPI_Type_create_struct"); - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); - diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild deleted file mode 100644 index 4b0bafedefaf..000000000000 --- a/sci-libs/pastix/pastix-5.2.3.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fortran-2 toolchain-funcs - -# TODO: -# testing: emake examples? -# better doc instalation and building -# pypastix (separate package?) -# multilib with eselect? -# static libs building without pic -# metis? - -# package id: change every version, see the link on inriaforge -PID=218 -DESCRIPTION="Parallel solver for very large sparse linear systems" -HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix" -SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2" -S="${WORKDIR}/${PN}_${PV}/src" - -LICENSE="CeCILL-C" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc int64 mpi +smp starpu static-libs" - -RDEPEND=" - sci-libs/scotch:0=[int64?,mpi?] - sys-apps/hwloc:0= - virtual/blas - mpi? ( virtual/mpi ) - starpu? ( dev-libs/starpu:0= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch ) - -src_prepare() { - default - sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \ - -e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \ - -e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \ - -e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \ - -e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \ - -e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \ - -e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \ - -e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \ - -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \ - -e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \ - -e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \ - -e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \ - -e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \ - -e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \ - -e '/fPIC/s/^#//g' \ - -e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \ - -e "s:pkg-config:$(tc-getPKG_CONFIG):g" \ - -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \ - -e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \ - -e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \ - -e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \ - -e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \ - -e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \ - -e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \ - config/LINUX-GNU.in > config.in || die - sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die -} - -src_configure() { - if use amd64; then - sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \ - -i config.in || die - fi - - if use int64; then - sed -e '/VERSIONINT.*_int64/s/#//' \ - -e '/CCTYPES.*INTSSIZE64/s/#//' \ - -i config.in || die - fi - - if ! use mpi; then - sed -e '/VERSIONMPI.*_nompi/s/#//' \ - -e '/CCTYPES.*NOMPI/s/#//' \ - -e '/MPCCPROG\s*= $(CCPROG)/s/#//' \ - -e '/MCFPROG\s*= $(CFPROG)/s/#//' \ - -e 's/-DDISTRIBUTED//' \ - -e 's/-lptscotch/-lscotch/g' \ - -i config.in || die - fi - - if ! use smp; then - sed -e '/VERSIONSMP.*_nosmp/s/#//' \ - -e '/CCTYPES.*NOSMP/s/#//' \ - -i config.in || die - fi - - if use starpu; then - sed -e '/libstarpu/s/#//g' -i config.in || die - fi -} - -src_compile() { - emake all drivers -} - -src_test() { - # both test and tests targets are defined and do not work - emake examples - echo -} - -src_install() { - default - sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die - # quick and dirty (static libs should really be built without pic) - cd .. || die - dodoc README.txt doc/refcard/refcard.pdf -} diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild index f8535d36390e..ad6337f2a1d9 100644 --- a/sci-libs/pastix/pastix-6.0.3.ebuild +++ b/sci-libs/pastix/pastix-6.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake fortran-2 python-single-r1 diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest index aa60693e1937..56461d5cff85 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -1,6 +1,8 @@ AUX pdal-2.4.3-fix-gdal37.patch 1499 BLAKE2B e9605af72f80f089aa25f3cba68c36e87a09ecd04152a66df0fa8b41720ece945fa09e53eb8db6d91330980a28edc5355e8cea45ee1304827e1276015cdb242f SHA512 804dbd95396988367a48b79675bc58414c1c819379149091239158c4270d581a58cc088137f80237bf793092adf32b02ee7b83645e101711fa638e3865228ae1 DIST PDAL-2.5.3-src.tar.bz2 102669314 BLAKE2B 1c6c8406f8de65a04364cc1141be809c00ea716fcfd5578833883357258855b3f7e70ea03c86f487dff0bc98072c29bed45a613c14ace05aef6ae49627b40374 SHA512 f67a303711b7d9e9dc14260afb96d299bcd5327ba0cc947143a583f55bd532a248b131e4602fd37d711ad0084e8601420828dacac40c414b95b8e9f9e8175e1b DIST PDAL-2.6.2-src.tar.bz2 87274819 BLAKE2B 5855a268889064fdc72d15ec1dbe7ab3ed8eb6bee2fa4ec724e9f287f25d6b9f9f9171829a2121e156bec575c96a42f26e223c807c8aa9d3a88f77c245c3d01c SHA512 4a9c07deaca6fbe994808904a6b90e09beb418155c662369046b6ddea03c8aa57ca2e9b4c2057c8e409bb197b90adb36e334c9c2136034a021be84763fa93551 +DIST PDAL-2.7.2-src.tar.bz2 87431434 BLAKE2B f5093008a84c9e5250bb9e8124c694a919b2a31c0f55b750f8d186e954c51c6672b5e63824203dfeb4efa24e6b0a8c0d354229a655416d5ef56336dc2bcd3a80 SHA512 81e4d4b136e292f5a2e4145f730e00375a26a6a2aa52af679bea6d9d371b55c92641475ea332fc8301fe35d237415b70ea311da3fc1bc4ff69013a7448f66896 EBUILD pdal-2.5.3-r1.ebuild 1249 BLAKE2B b995c920174926e3a90dc026516471e61993ce3c69594ca30722e87e1caa212b9fc9bf1c768d6bd58ae311af98127dc63b1b9056da85f395318cdb5b3c855924 SHA512 3768f089397aa8707232be5036dab147a0a5e090a1aabd029a8aa078e618b8227043d928e6d53a6b7b0b5e9b5696f4eb4c200f17de469a96c075ffc43388a656 EBUILD pdal-2.6.2.ebuild 1492 BLAKE2B 24743260105565e213ae4b98c9e73c11f578bb5f484a908fbb25b41bf8888ccf72fa84faa8bc97d22d9dfa8e221769b796365abfd2204888e90a2fe79c0fab72 SHA512 4c9eab35b9f7a934a85e1a61f732daf738e24af01e86c50a8d713d4cd49ccc66a66ead5c76123dfbeecabc2f0a530fab25d18c6ced4f34e276830e4b42a43ceb +EBUILD pdal-2.7.2.ebuild 1493 BLAKE2B 4e8d975492905b6f542cda05253c8f1d22c069ea833bce18c11c363ceb6e54b4b43b6c488b3cd6bd778648d941030906eaf5c04188c2fcff963c1c6dfc7ee930 SHA512 701e81e470f4386eb7d2da99cdb879d35d2c3991433711e8a85ca343837e9226793331eab72aa29addfbc24e9f4c837932c76882f52350f713e760b720afeead MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2 diff --git a/sci-libs/pdal/pdal-2.7.2.ebuild b/sci-libs/pdal/pdal-2.7.2.ebuild new file mode 100644 index 000000000000..84959cdb0a36 --- /dev/null +++ b/sci-libs/pdal/pdal-2.7.2.ebuild @@ -0,0 +1,69 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="A C++ library for translating and manipulating point cloud data" +HOMEPAGE="https://pdal.io/" +SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.bz2" +S="${WORKDIR}/PDAL-${PV}-src" + +LICENSE="BSD" +SLOT="0/17" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="debug postgres test" + +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + net-misc/curl + app-arch/zstd:= + dev-libs/libxml2 + dev-libs/openssl:= + sci-libs/gdal:= + sci-libs/libgeotiff:= + sys-libs/zlib + debug? ( sys-libs/libunwind:= ) + postgres? ( dev-db/postgresql:*[xml] ) +" + +DEPEND=" + test? ( sci-libs/gdal[geos,jpeg,png] ) + ${RDEPEND} +" + +RESTRICT="!test? ( test )" + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862915 + # https://github.com/PDAL/PDAL/issues/3836 + # + # only occurs inside unwind support + if use debug; then + append-flags -fno-strict-aliasing + filter-lto + fi + + local mycmakeargs=( + -DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)" + -DWITH_COMPLETION=ON + -DWITH_BACKTRACE="$(usex debug)" + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + --exclude-regex '(pgpointcloudtest|pdal_info_test|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test|pdal_io_stac_reader_test)' + --output-on-failure + -j1 + ) + + cmake_src_test +} diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest index 84d7fe6f6c38..0ad7d131d319 100644 --- a/sci-libs/proj/Manifest +++ b/sci-libs/proj/Manifest @@ -1,8 +1,13 @@ +AUX proj-9.4.1-include-cstdint.patch 992 BLAKE2B a78dc0fb259a863e83fc1b4dc77591b1c1b110aeef055351324185b8af1aa2882cdfaf261f99a0e007497d7dcf53583dce8458aed75ed35d8fdf882bff851cd3 SHA512 4b9f44383e9fa6466df3bf81bfe34cd3f023961d5167d6467fe66eeafbf690463491c4eea70c7be6be0dc68fe1c84bfc0ba39728a97dfa2f83f2eebb1ac009ad AUX proj-geotiff.patch 943 BLAKE2B e2d1df20f8b87239e2c1f748e92b4ab5a3fe567994e6ce0c136383d1d0fcd1efa99e6c5586924d675acc3539e006e401a8683e719ff8532790e727ef19af4b71 SHA512 8462ef4f231d41b1a947528afa36da9e4231fae1adfb9bba8465a3402be8e78ae95ed39424e3f6ed635b0e2a0d9f2cfb9bc36187303444d80abc41518817ed3a DIST proj-9.2.1.tar.gz 5536575 BLAKE2B e08dc370cfac2c6358e1b28e44f3893c75e07fd64a4235041edf836885d31af33605673486edb122cec8aa13a2c564156c429a68e5045de52d8ea970d2e440f1 SHA512 5640e9bd4ea24a0e0b1521c90b8f709b64b9ee357190aaf08af0cff5df68ae93bdfb27211bde5c50340b067fc218b4f2aa8fb998ed2852ebeb2c2ad0ac4629ef DIST proj-9.3.0.tar.gz 5559825 BLAKE2B 83916294411a35094a2dbc89b1f219eff9b9baa4df6322a51a1965979044a36b4f1b75a99ea96fed8f59937ac000337a3e2e8ad4d9e1ef2ae929ccb7e06654b0 SHA512 1a79a7eaab0859cf615141723b68d6dd7b88390c3e590df12ec0d4c58ba69574863e5892d8108818dbc7e8abbf0b6372496228c02411d506b7169f732ff5cd57 +DIST proj-9.4.1.tar.gz 5665272 BLAKE2B 9751ca658e77650236e5d8888d4d3a5e3da4c5761494d1a544baa565bd0aea967c08d871d7b67de0b0f7ffb07fc16212edbbd3a91532c70677e1702e050a7f7e SHA512 e9e4a80125a9481709fa7a16c8ceed7c5480c1d9152fe0c16ff69cd976081b9f41e23783459ee2a50771ec7f6210f46167de5af9ee943ff274bd27a1de4b6305 DIST proj-data-1.13.tar.gz 709788173 BLAKE2B 33a487f327d2b35acfd6c7c12286bcd6e338c3459540482f968ef7038d78cea9d1519d89ba979f493e007fa961e0eb955889bf2348a235705ec3b71abf1e31c1 SHA512 14eca1b47dad913de608babc73708a35da8bb614c5374e990564a32549998a16e90d4c548f2dac0cd555fc8a4a645eeaf649db929cc38906bee1050e378a662e DIST proj-data-1.15.tar.gz 727387470 BLAKE2B 03d5b69214e23741ae214ff18f523542247fdca5c301891616be6b79c8a916bf762d0a7ee3983cee62236bc0d4d1b5fc93151164b134db220d4582b15a84e8d7 SHA512 4007c639d5c9f0422652315e8d69527eb39e3d045cef3537361e16c61c9aae76d69e3eb7efefead04793350b8502114eec740efe970f25fbbee2db449b2e3694 +DIST proj-data-1.18.tar.gz 735652646 BLAKE2B 62ca77e6f0a58992a914ebc6a7558b5ddb4529a5bf20a96eedbc62ef7c1bcc5c05582663846e43e132a1b8eaf821bbbc0be792335bad03028db085422d3ed269 SHA512 805eadd29665697398f568f5e4f45df8eadea6fc2841ce901c703613fab13f6f064e6f187621e76017b9b67bb1ca0c6dc1dd2be9848c5169d7e6ebaa2aeea950 EBUILD proj-9.2.1-r1.ebuild 1615 BLAKE2B 67182f158f8a60ee20eb18e66a452d425794cdbdadf1ee5e29c99f6557a6c94434d9734b0aebd7d79a9913e88f9d49ba0f5398da14bb49b8bf9ba01e43322ef5 SHA512 cc3f35f803878fa526789bb882f06782c83de0b40cdeaa3334e46db8600057b48be9606039c38fa9694ac112f09830f5b5c8a1271e35245adc81385ac53b41ea EBUILD proj-9.3.0-r1.ebuild 1619 BLAKE2B 53ecd62a0b9ca95f3ef45940004342c3dc2c039c751af27da6827d813a017642efcc2c2328f875016cec907eb8a56f409b4b5cc7681b20326a01a1a9da3aeed6 SHA512 86a9107e4b00cf02315cc479062dc2754f792fe811ec770bdfdc36ce0d0d485bee93370f7add15c97a2d14166cc05dbb9ba38fcc8172d12e26f6fa13a3347748 +EBUILD proj-9.4.1.ebuild 2220 BLAKE2B f445cf35a273a38d7c3c7dbaab9466031f21434a0bc107c64b20c4443645c2f721aed99188356b5bfa7a5c2d59be9b734a41f73b4454e94fa7d445c1574022aa SHA512 e44b326f2259747d94fc1210b570fc140c2fd5b9f9d4eed55daaab9ee9146c321a2aa677b011904ac1aae222d9e014563ec7da1e4dfcc86d6bcbd445059b62aa +EBUILD proj-9999.ebuild 2171 BLAKE2B 5afcffb9cf19aec6f2c3a7caa3f325940e61ecc6a41227e6d8ec2285ad74ecd1c70ab424a39dc9448db19edb30bad075a057d06452507e396cbbc79e5629cc04 SHA512 ff0968131ddd97a084d21891fff1d03fa0a277fffa3e0a21c26bd1be580cc779d9d63abc6a3aab0cdae6a64dcb4f8d6a7f1ed330c81c8d48481d47e913453cb8 MISC metadata.xml 345 BLAKE2B 356bd57a232baa5119842e6741d735afe44bf2c48fe144286743dd64716b3777f190980074d9013640cabb57306057e0abd42ea9fed80a44ee53366ea2413b23 SHA512 ec91a8fd73c7c798cfb0f23fc138e79bc642181265e4ee1fd94b9535dc3ae97e717f9115300ba648314e177f1dd3d0e3077e5746fbbc4c8eacd9b4692c721453 diff --git a/sci-libs/proj/files/proj-9.4.1-include-cstdint.patch b/sci-libs/proj/files/proj-9.4.1-include-cstdint.patch new file mode 100644 index 000000000000..482e967805ac --- /dev/null +++ b/sci-libs/proj/files/proj-9.4.1-include-cstdint.patch @@ -0,0 +1,37 @@ +https://github.com/rouault/PROJ/commit/35546a7eb1846b93bd035932562193b980c27520 + +From 35546a7eb1846b93bd035932562193b980c27520 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Wed, 7 Aug 2024 11:25:30 +0200 +Subject: [PATCH] Add missing include cstdint + +Fixes #4215 +--- + src/apps/cct.cpp | 1 + + src/apps/cs2cs.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/apps/cct.cpp b/src/apps/cct.cpp +index f7d46cd655..193fff6e47 100644 +--- a/src/apps/cct.cpp ++++ b/src/apps/cct.cpp +@@ -79,6 +79,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-25/2017-10-26 + #include <string.h> + + #include <algorithm> ++#include <cstdint> + #include <fstream> // std::ifstream + #include <iostream> + +diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp +index 27caa603cc..88353bf8f0 100644 +--- a/src/apps/cs2cs.cpp ++++ b/src/apps/cs2cs.cpp +@@ -36,6 +36,7 @@ + #include <string.h> + + #include <cassert> ++#include <cstdint> + #include <iostream> + #include <string> + #include <vector> diff --git a/sci-libs/proj/proj-9.4.1.ebuild b/sci-libs/proj/proj-9.4.1.ebuild new file mode 100644 index 000000000000..2658f91d09c9 --- /dev/null +++ b/sci-libs/proj/proj-9.4.1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="PROJ coordinate transformation software" +HOMEPAGE="https://proj.org/" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/PROJ.git" + EGIT_DATA_REPO_URI="https://github.com/OSGeo/PROJ-data.git" +else + # Check https://proj.org/download.html for latest data tarball + # https://github.com/OSGeo/PROJ-data/releases + PROJ_DATA_PV="1.18" + SRC_URI=" + https://github.com/OSGeo/PROJ/releases/download/${PV}/${P}.tar.gz + https://github.com/OSGeo/PROJ-data/releases/download/${PROJ_DATA_PV}.0/${PN}-data-${PROJ_DATA_PV}.tar.gz + https://download.osgeo.org/proj/${P}.tar.gz + https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1)" +# Changes on every major release +IUSE="curl test +tiff" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-db/sqlite:3 + curl? ( net-misc/curl ) + tiff? ( media-libs/tiff:= ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.4.1-include-cstdint.patch" +) + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + + git-r3_fetch "${EGIT_DATA_REPO_URI}" + git-r3_checkout "${EGIT_DATA_REPO_URI}" "${S}/data" + else + unpack "${P}.tar.gz" + + cd "${S}"/data || die + mv README README.DATA || die + + unpack "${PN}-data-${PROJ_DATA_PV}.tar.gz" + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DBUILD_PROJSYNC=$(usex curl) + -DENABLE_CURL=$(usex curl) + -DENABLE_TIFF=$(usex tiff) + ) + + if use test ; then + mycmakeargs+=( + -DUSE_EXTERNAL_GTEST=ON + -DBUILD_BENCHMARKS=OFF + -DRUN_NETWORK_DEPENDENT_TESTS=OFF + ) + fi + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + # proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html + # testprojinfo: Also related to map data? + "proj_test_cpp_api" + "testprojinfo" + ) + + cmake_src_test +} + +src_install() { + cmake_src_install + + cd data || die + dodoc README.DATA + + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/sci-libs/proj/proj-9999.ebuild b/sci-libs/proj/proj-9999.ebuild new file mode 100644 index 000000000000..c269939f1a73 --- /dev/null +++ b/sci-libs/proj/proj-9999.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="PROJ coordinate transformation software" +HOMEPAGE="https://proj.org/" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/PROJ.git" + EGIT_DATA_REPO_URI="https://github.com/OSGeo/PROJ-data.git" +else + # Check https://proj.org/download.html for latest data tarball + # https://github.com/OSGeo/PROJ-data/releases + PROJ_DATA_PV="1.18" + SRC_URI=" + https://github.com/OSGeo/PROJ/releases/download/${PV}/${P}.tar.gz + https://github.com/OSGeo/PROJ-data/releases/download/${PROJ_DATA_PV}.0/${PN}-data-${PROJ_DATA_PV}.tar.gz + https://download.osgeo.org/proj/${P}.tar.gz + https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1)" +# Changes on every major release +IUSE="curl test +tiff" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-db/sqlite:3 + curl? ( net-misc/curl ) + tiff? ( media-libs/tiff:= ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( +) + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + + git-r3_fetch "${EGIT_DATA_REPO_URI}" + git-r3_checkout "${EGIT_DATA_REPO_URI}" "${S}/data" + else + unpack "${P}.tar.gz" + + cd "${S}"/data || die + mv README README.DATA || die + + unpack "${PN}-data-${PROJ_DATA_PV}.tar.gz" + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DBUILD_PROJSYNC=$(usex curl) + -DENABLE_CURL=$(usex curl) + -DENABLE_TIFF=$(usex tiff) + ) + + if use test ; then + mycmakeargs+=( + -DUSE_EXTERNAL_GTEST=ON + -DBUILD_BENCHMARKS=OFF + -DRUN_NETWORK_DEPENDENT_TESTS=OFF + ) + fi + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + # proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html + # testprojinfo: Also related to map data? + "proj_test_cpp_api" + "testprojinfo" + ) + + cmake_src_test +} + +src_install() { + cmake_src_install + + cd data || die + dodoc README.DATA + + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 97e36ee233ee..54c472774d2d 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -4,8 +4,15 @@ AUX pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch 1063 B AUX pytorch-2.0.0-global-dlopen.patch 834 BLAKE2B da3ddd29124ab345e50acd4b42cb310d75d7c9b13005ee41051a1a2b702958b81677fe4f7e76dcd678dd439c89114de2e568f4330380e6e621d2975957293921 SHA512 fa0156229d7cd20e0f3949913750ecf3d8c2f0e872c8dc272cb0144427e079938588c7d4d3fec087b6cfd7846ed6844fbaa3c5510e9be8890be926ba854f7833 AUX pytorch-2.1.1-dontbuildagain.patch 443 BLAKE2B 67cc940ae5be4d3a0a5ef6670a72de4f3419582b59bb7e905d4ee704c928c353f1ef03a446ac97f0718d24e5a88fc656c8e58e26f869c6eeef5d21b918308f36 SHA512 4acf9dfca8e998a5ec1f6eebb7ffd5833f065dd995ef735c50ce34fb2553bbacc974c13eeaf07962d00de0f795fd4366a1866d1bb834ed93098217400db9dc6c AUX pytorch-2.2.1-emptyso.patch 464 BLAKE2B 8c93245f36218a63a910ddf41e1181c83306485ae788cc47ad191641dfed13b2f0ce8b492c9e377279a2ee8ed83c2aaac25e1ba8b4cad3d5a07c7bbc95d60063 SHA512 1f5cbd5937d20411a74812347a2a02111d80fcc73453717eb136d8e3ffc94f839234713b77c2c89b07f87404a132fd0a1d345666df8d6a3ba01284cc0b752fc2 +AUX pytorch-2.4.0-dontbuildagain.patch 416 BLAKE2B 42d62ba2342a32a7eb0a8062750cd59ca9ebd6085b06f6751ac884c7daaf6d4a36373290403c02da7bd8d96e409cb7f57fc601cab4bace45613b3f7a14892c24 SHA512 a844b68faf11072b6e2b7d23cd17fff21cb96226f72dc6b52ec5d4f98d48beebcb341b3528b70c89e831e6de0aecefd01e3ad3f41c05347114ca8c19bd31c34d +AUX pytorch-2.4.0-global-dlopen.patch 887 BLAKE2B 044e7708619070f93b1157a0c4e560dadda88b299c32023f4f953711201c308966e07dc6c8a34ed9f56cd6ee4b02d5870fd3637365f83f98444695f5747ca7cb SHA512 091b353b33a5d8496836adcafba7f0c04f2085ddbd33bf1fda8222a4afdf2c5b12bed53c26140f22442a1a77c465b326f603de02837f6d214f16dfae01c56417 +AUX pytorch-2.4.0-torch_shm_manager.patch 367 BLAKE2B f03c002cbd50fb959dfc3ccf89cb8aa9fe6e001ff2cb47bee45cde28cac262e20df1d06f396776ce069f0a9e92cd370c96788db0aa5d1b9d9f3bc1832701502a SHA512 94f095908385b3058863d05a78a0e243f8614bbde406d457e50bdba574a8e1911b77790a0806f705644dc0c0ae235888314ea4a31aed7c0eb8ddfb29ff42636e DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c +DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 +DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 EBUILD pytorch-2.2.2.ebuild 1616 BLAKE2B 3817dd668463c3393fc6227809644cc7409cdcb099b009571dde0760f67bcf0bb36da6d8c24e1d99be57899db9d6fb57c34e07ac63248f471ff780d2f8164b65 SHA512 97530019b0f973fad14bcfc878669f4f8a1de3f4b2d65a8909a53d3ca32b0ba099a7ffccb9317eeb8d7d8e9bae1495d36dec3896f1f54ee260ad6af89796c86c EBUILD pytorch-2.3.0.ebuild 1616 BLAKE2B 3817dd668463c3393fc6227809644cc7409cdcb099b009571dde0760f67bcf0bb36da6d8c24e1d99be57899db9d6fb57c34e07ac63248f471ff780d2f8164b65 SHA512 97530019b0f973fad14bcfc878669f4f8a1de3f4b2d65a8909a53d3ca32b0ba099a7ffccb9317eeb8d7d8e9bae1495d36dec3896f1f54ee260ad6af89796c86c +EBUILD pytorch-2.3.1.ebuild 1616 BLAKE2B 3817dd668463c3393fc6227809644cc7409cdcb099b009571dde0760f67bcf0bb36da6d8c24e1d99be57899db9d6fb57c34e07ac63248f471ff780d2f8164b65 SHA512 97530019b0f973fad14bcfc878669f4f8a1de3f4b2d65a8909a53d3ca32b0ba099a7ffccb9317eeb8d7d8e9bae1495d36dec3896f1f54ee260ad6af89796c86c +EBUILD pytorch-2.4.0.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 diff --git a/sci-libs/pytorch/files/pytorch-2.4.0-dontbuildagain.patch b/sci-libs/pytorch/files/pytorch-2.4.0-dontbuildagain.patch new file mode 100644 index 000000000000..4fe5b0bdeb86 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.4.0-dontbuildagain.patch @@ -0,0 +1,17 @@ +--- a/setup.py ++++ b/setup.py +@@ -473,14 +473,6 @@ def build_deps(): + check_pydep("yaml", "pyyaml") + build_python = not BUILD_LIBTORCH_WHL + +- build_caffe2( +- version=version, +- cmake_python_library=cmake_python_library, +- build_python=build_python, +- rerun_cmake=RERUN_CMAKE, +- cmake_only=CMAKE_ONLY, +- cmake=cmake, +- ) + + if CMAKE_ONLY: + report( diff --git a/sci-libs/pytorch/files/pytorch-2.4.0-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-2.4.0-global-dlopen.patch new file mode 100644 index 000000000000..e72ed94e6888 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.4.0-global-dlopen.patch @@ -0,0 +1,20 @@ +--- a/torch/__init__.py ++++ b/torch/__init__.py +@@ -223,7 +223,7 @@ def _load_global_deps() -> None: + if library_path: + global_deps_lib_path = os.path.join(library_path, 'lib', lib_name) + try: +- ctypes.CDLL(global_deps_lib_path, mode=ctypes.RTLD_GLOBAL) ++ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) + except OSError as err: + # Can only happen for wheel with cuda libs as PYPI deps + # As PyTorch is not purelib, but nvidia-*-cu12 is +@@ -245,7 +245,7 @@ def _load_global_deps() -> None: + raise err + for lib_folder, lib_name in cuda_libs.items(): + _preload_cuda_deps(lib_folder, lib_name) +- ctypes.CDLL(global_deps_lib_path, mode=ctypes.RTLD_GLOBAL) ++ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) + + if library_path: + # loading libtorch_global_deps first due its special logic diff --git a/sci-libs/pytorch/files/pytorch-2.4.0-torch_shm_manager.patch b/sci-libs/pytorch/files/pytorch-2.4.0-torch_shm_manager.patch new file mode 100644 index 000000000000..b1303d141dce --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.4.0-torch_shm_manager.patch @@ -0,0 +1,11 @@ +--- a/torch/__init__.py ++++ b/torch/__init__.py +@@ -1691,7 +1691,7 @@ py_float = float + py_int = int + + # Shared memory manager needs to know the exact location of manager executable +-_C._initExtension(_manager_path()) ++_C._initExtension(b"/usr/bin/torch_shm_manager") + del _manager_path + + # Appease the type checker: it can't deal with direct setting of globals(). diff --git a/sci-libs/pytorch/pytorch-2.3.1.ebuild b/sci-libs/pytorch/pytorch-2.3.1.ebuild new file mode 100644 index 000000000000..75fbde095842 --- /dev/null +++ b/sci-libs/pytorch/pytorch-2.3.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_EXT=1 +inherit distutils-r1 prefix + +DESCRIPTION="Tensors and Dynamic neural networks in Python" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} +RDEPEND=" + ${PYTHON_DEPS} + ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/typing-extensions[${PYTHON_USEDEP}] + dev-python/sympy[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND} + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + ') +" + +src_prepare() { + eapply \ + "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ + "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ + "${FILESDIR}"/${PN}-2.0.0-global-dlopen.patch \ + "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ + "${FILESDIR}"/${PN}-1.13.0-setup.patch \ + "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ + + # Set build dir for pytorch's setup + sed -i \ + -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ + tools/setup_helpers/env.py \ + || die + distutils-r1_src_prepare + + hprefixify tools/setup_helpers/env.py +} + +python_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + USE_SYSTEM_LIBS=ON \ + CMAKE_BUILD_DIR="${BUILD_DIR}" \ + distutils-r1_python_compile develop sdist +} + +python_install() { + USE_SYSTEM_LIBS=ON distutils-r1_python_install +} diff --git a/sci-libs/pytorch/pytorch-2.4.0.ebuild b/sci-libs/pytorch/pytorch-2.4.0.ebuild new file mode 100644 index 000000000000..31e3b0439a9d --- /dev/null +++ b/sci-libs/pytorch/pytorch-2.4.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_EXT=1 +inherit distutils-r1 prefix + +DESCRIPTION="Tensors and Dynamic neural networks in Python" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} +RDEPEND=" + ${PYTHON_DEPS} + ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/typing-extensions[${PYTHON_USEDEP}] + dev-python/sympy[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND} + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + ') +" + +src_prepare() { + eapply \ + "${FILESDIR}"/${PN}-2.4.0-dontbuildagain.patch \ + "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ + "${FILESDIR}"/${PN}-2.4.0-global-dlopen.patch \ + "${FILESDIR}"/pytorch-2.4.0-torch_shm_manager.patch \ + "${FILESDIR}"/${PN}-1.13.0-setup.patch \ + "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ + + # Set build dir for pytorch's setup + sed -i \ + -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ + tools/setup_helpers/env.py \ + || die + distutils-r1_src_prepare + + hprefixify tools/setup_helpers/env.py +} + +python_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + USE_SYSTEM_LIBS=ON \ + CMAKE_BUILD_DIR="${BUILD_DIR}" \ + distutils-r1_python_compile develop sdist +} + +python_install() { + USE_SYSTEM_LIBS=ON distutils-r1_python_install +} diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest deleted file mode 100644 index 6a70d498fde0..000000000000 --- a/sci-libs/rtree/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST Rtree-1.0.0.tar.gz 48837 BLAKE2B 60e516155e7e48158494b7ea4720dc71ece2111fb94e320976a6dd691d2458b8586c2bf8109a37d86db211ac342d77877b435bdb54627a94c898642e8520a071 SHA512 9a414cd65b27ba35313dd7185dece83f5d7235867f6f0c72c2902d7ffd72808138dbf30d8fe11c8bbf0ec463072e5f6112d75b5fdd5a1dab7720c56d3632d576 -EBUILD rtree-1.0.0.ebuild 598 BLAKE2B 26202e6b043c25076f173176bb90057dc9aee22ecb89f05fd5d8daf93839353df221b05e6ed099d5812ea8030d6041fa27238ea8d1130c5fb11534d1cfd3403d SHA512 bb195d166ea5f12494e860bb581b784e5d3e858c39aef7c8eb090464e16bde8b5cc85a6d9ed843b26ecbb53d61b05519f7f990727d123c82598596013c896e80 -MISC metadata.xml 839 BLAKE2B 1a948191fec4142d6c2731639ff99c4185a58231d22683f0541ec557b6b0650d2b4cb1c54238a0d5d6baf1cd7a7fe24722f832306050179b5f6c0a168ffc18ac SHA512 b63ea233bec3285bda6008728a82799c97f7ea544e1800952a53f480e4eedb8a59a2e9e77901785d93ab46eb79ea397d8829c16210bb3bd84820c87a54c7d287 diff --git a/sci-libs/rtree/metadata.xml b/sci-libs/rtree/metadata.xml deleted file mode 100644 index 34c930a0bce1..000000000000 --- a/sci-libs/rtree/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>3dprint@gentoo.org</email> - <name>Gentoo 3D Printer Project</name> - </maintainer> - <maintainer type="person"> - <email>andrewammerlaan@gentoo.org</email> - <name>Andrew Ammerlaan</name> - </maintainer> - <longdescription> - Rtree is a ctypes Python wrapper of libspatialindex that provides a number of advanced spatial indexing - features for the spatially curious Python user. - </longdescription> - <upstream> - <bugs-to>https://github.com/Toblerity/rtree/issues</bugs-to> - <remote-id type="github">Toblerity/rtree</remote-id> - <remote-id type="pypi">Rtree</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/rtree/rtree-1.0.0.ebuild b/sci-libs/rtree/rtree-1.0.0.ebuild deleted file mode 100644 index ffa872d759b3..000000000000 --- a/sci-libs/rtree/rtree-1.0.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYPI_PN=${PN^} - -inherit distutils-r1 pypi - -DESCRIPTION="R-Tree spatial index for Python GIS" -HOMEPAGE="https://rtree.readthedocs.io" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm64 ~x86" - -RDEPEND=" - sci-libs/libspatialindex - dev-python/typing-extensions[${PYTHON_USEDEP}] -" - -BDEPEND=" - test? ( dev-python/numpy[${PYTHON_USEDEP}] ) -" - -distutils_enable_sphinx docs/source -distutils_enable_tests pytest diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest index 4056c39debbf..f5b2ba7278cd 100644 --- a/sci-libs/stellarsolver/Manifest +++ b/sci-libs/stellarsolver/Manifest @@ -1,5 +1,7 @@ AUX stellarsolver-2.5-compiler-warning.patch 1046 BLAKE2B a9820195206c698bd3107846e52a48e648555ce6da2d8700f6a44bf4bcba80c968e5ff60bfcb556c0c7b1b405acd3702a37bb2dcba30f999edff92c566237090 SHA512 4136dff3be775e1ec426eff9be5caf5368cec8faa969752ecce55b0680da0c5b725541632116507dfbe381025986fc188be4534ac98ffe9bfb4860fdb099365c AUX stellarsolver-2.5-qsort-warning.patch 10025 BLAKE2B d16f29912b6190e4dc0af6ba307064e1312737eafff211fab1466f2f13af40e9afb6100e728d71d60cae83e8bc88175bf79dedce82f938fd372be22266a21c47 SHA512 a099ef0d47fabec1b9f776a4f901e39daa0231db559837a2f40bf5fa23847513f188bd9292758f5c4f055a5ea62fe03e7c45b8dd129453d41d10b20a510c1d3a DIST stellarsolver-2.5.tar.gz 23402988 BLAKE2B ec1ab428413104a329128e3e90883884eedf2c031fb4f3f5a8ab7579243a7b7a496579f3127ad0324176cf825d02a417e1538272b931a87090f1373adf0d1239 SHA512 003522ac0b4130e0ca16ccb617743e3716aa2a182ad63abfb901ea0b47c28a745e8ca1e5b7874d17636ff948b1ebc055277557f89a159e425af7d2a64f513fe8 +DIST stellarsolver-2.6.tar.gz 26565848 BLAKE2B 35cceedca14b6fc062d963a47954b1c06ef908f4f8572776ca4de6a4b618eb72445cf05aefc5c62fa7a0a55e3719e6201f5734a827fc2fe752b919a30bd9c0cc SHA512 28c15e1cbc4e5d9b852001b80e8183ea98557ef0bdf0c9b3a238485d9594058bbd7003abc77cb41caf6717c809c7a3d1babd236adbeac6bb0e383f5a73815e95 EBUILD stellarsolver-2.5-r1.ebuild 820 BLAKE2B be6a583c400701b7d077947d34ba8c66289d62240165c1e29415e82ed2850e5c7f2d37d98cba8e1efe4a6decf48d5493ca7d4f63497dc3c7b0ec6823c6bad9d2 SHA512 cf94a41d01777c670f938ad59f4de07ca528dd39675c504e9d4d393bdcd61b61c4f778c0d1262d5c29c1fdb20dfd4705c43bad5486ba5cf31ec9ef87d30bcace +EBUILD stellarsolver-2.6.ebuild 827 BLAKE2B 9133bee415347375b41dc62fd4ef90e20e72b34d83658d71dd177053e93db487b562673c8a18d8cc6e271ced69a9f77cc90d375d71307cf552dc7a62c9eae1a6 SHA512 690e6e94bbfc58a4446408413b882c558cbcb0692d9a5f0ec6643fc302dc5e591d53fcb6c93e6ffb2308c126601def89b1cfcb77506a5ec41b53f0e204d9fd92 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77 diff --git a/sci-libs/stellarsolver/stellarsolver-2.6.ebuild b/sci-libs/stellarsolver/stellarsolver-2.6.ebuild new file mode 100644 index 000000000000..e257a6f5826b --- /dev/null +++ b/sci-libs/stellarsolver/stellarsolver-2.6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver" +HOMEPAGE="https://github.com/rlancaste/stellarsolver" +SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + sci-libs/cfitsio:= + sci-libs/gsl:= + sci-astronomy/wcslib:= +" +DEPEND="${RDEPEND}" + +src_configure() { + # bug #862930 + filter-lto + + local mycmakeargs=( + -DUSE_QT5=ON # future TODO: check if Qt6 can be enabled safely + -DBUILD_CLI=OFF # nothing is installed (yet?) + ) + + cmake_src_configure +} diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest index cdfbd8e96db2..6c92164e7147 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -4,5 +4,5 @@ AUX symengine-0.8.1-fix_llvm.patch 2674 BLAKE2B f7d493318389f63a8b61f47ee2ba6429 DIST symengine-0.11.1.tar.gz 898181 BLAKE2B ef14e09ceb7e9783711ca7f9f06a59362c40222e7f85de5545be834ecd79bbf41fcd34141bb3a63c106ee45067dd0b957377f937097183ffd5b93c6943976571 SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac DIST symengine-0.12.0.tar.gz 898768 BLAKE2B 81bca3f59e864d2e37598a058cb4db97b1f9c8536ee841c10df6f01c6322fa744281ecdeb338e5bf33bf599ead66adcaaa724650535df9b3d4bd7f07e22a3ad2 SHA512 fbc73a75299c19155a09f1854888a5050150aaad5bc3df683d43e8036af8005f8152a36ae79029e00bc8422c3edd7252baaf3a0da6a21d1d754d80a44c5c68bf EBUILD symengine-0.11.1.ebuild 2714 BLAKE2B 0d8f638d1ea0be177f79b7571d4d433fc12b48ed6d812d762fc9465e2c9c727840dc572f2026ef66c8b0ff87d2e86ab356de0964b60cdd9d1ff0d4dddf10b86e SHA512 08c697e06469b082e9a3cde4209b6daf4903fc67a7dd66d0cbbf55f7de4ec78b1c3bbd630bcec7644022785664e6ce3279c1605936d54038108ac232e60cb8eb -EBUILD symengine-0.12.0.ebuild 2476 BLAKE2B be2f9f4b3fc05ff9ecfc64f1ae1fcbf73a153efc31577fd4e795fe4551cba51408aebae38c27096536dec91c5bc2769f1a6b0bc5cbfbfeb84d10365f2bbc2168 SHA512 de3a9f5ad25f9b2b889bc908340d1048d6df212081dd031bf34bedeacda47d6617acc60a0a390c2f89c5787773655399aaac54347704c42ea3667f702f94dbdf +EBUILD symengine-0.12.0.ebuild 2474 BLAKE2B 2a56218ff88a68dd500e3c9357abe34fed4534580c543616c483c99135628a51174244c8f398c94900851dc275fbb6cf9c57ae07d567e55e8df860e7c568455b SHA512 f42f7ef86749d823162e3ea856ad34f652b4eb1799d9b405a6d4f65ae503bad27c44b4130cc5363841ba8bae925e5f97ed4a37261e448ca2b3ca1721bc9f716f MISC metadata.xml 1270 BLAKE2B e52ff12980457252a05195ef47bd90e52816794948169473a597e263d744d163cbe42d35e995243daf6b8664f1ed7d41879b63927606187277cdf503fc7bf846 SHA512 4fd6f340d1d4952774eb0fcd47d9ed6e9f145bd83ba7bd04fe428faa96ec63b6cd62173b6ead116a649471fe9b6466be7bbb48c8e534b3203f232f9a7bae12b9 diff --git a/sci-libs/symengine/symengine-0.12.0.ebuild b/sci-libs/symengine/symengine-0.12.0.ebuild index 8511224ebba8..a9b7f631466a 100644 --- a/sci-libs/symengine/symengine-0.12.0.ebuild +++ b/sci-libs/symengine/symengine-0.12.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" # BUILD_FOR_DISTRIBUTION enables threads by default so do it here IUSE="benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" RESTRICT="!test? ( test )" diff --git a/sci-libs/symmetrica/Manifest b/sci-libs/symmetrica/Manifest index 9aa658d2131e..d9b39e70630a 100644 --- a/sci-libs/symmetrica/Manifest +++ b/sci-libs/symmetrica/Manifest @@ -1,3 +1,3 @@ DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271 -EBUILD symmetrica-3.0.1-r1.ebuild 530 BLAKE2B 77d77e6caaaf39ad9cff62754b6598b67b622578f52c3b3d3f37e585e392c0f50f0d875678c368ac92a607c0f8c1b85b55ba51ad531ad1d2e64864712229ea74 SHA512 3932dd561693aa471df15a311228f4cbc5ac5c7e969852e70c14b2a69593af039e68a0f6a7796c705ed4026a6249c104f4a110619b6334251a3668f452242798 +EBUILD symmetrica-3.0.1-r1.ebuild 537 BLAKE2B b96ba155a139ec65752070afdb5702d6bd3b160e87dc10ebcc897f30b178e4a39a629a626ce766c4d1faad91043c84e7be162f79757a5205f8d9fe2d503f1df7 SHA512 b61fc5ccb14276521c3fc27d2c66620296e7551d9a241ed8b4e94d20db30c2b20281e2c6b1250ee6e205dcd7ba3fe89ec1b61f285c90090ce99f34c0dac038cb MISC metadata.xml 770 BLAKE2B 6a6035b830992a2d990f2bc0de458622f15c2d423f270ee542d6af9af128032f41108a9b9c3d40360e6847c0fe4c5bb10ca68564246a2c8ee2f2a96b3bb79d4e SHA512 aa5e5ea606826363afe447924f02f7800197dce9ef928558ff9a3b6f95bb3229747e42c4e004bcb76fd0faea34f9d807c6b720ffdd16b9b35e394f1330386f09 diff --git a/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild b/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild index 9e2594472ee3..ff73f597c54d 100644 --- a/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild +++ b/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://gitlab.com/sagemath/symmetrica/uploads/b3d8e1ad5ab2449c30bbc314 LICENSE="ISC" SLOT="0/2" -KEYWORDS="amd64" +KEYWORDS="amd64 ~riscv" IUSE="doc" DOCS=( README.md ) diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest index 8f5317b430ae..f18876d396ed 100644 --- a/sci-libs/trilinos/Manifest +++ b/sci-libs/trilinos/Manifest @@ -1,7 +1,9 @@ DIST trilinos-14.4.0.tar.gz 188325969 BLAKE2B 909e3ebe229d035263d835e0d68977516d2a5df168785021fe300f7904e149586a82a6dba271cc1472455472397ee5467443244fb68fb27c00cf4e9b3d10a282 SHA512 497fc4fb4ab4338fffef7111635f3dc3b12cb7302bc3f56bafb5cc75b7c68e94cc22fcacd9dd625803a0f38e4fbce5105cab61df76e033a4581568c36a53fe8a DIST trilinos-15.0.0.tar.gz 182971338 BLAKE2B 0e459b9d070085a2a5bf06de8274ceec628f8913ab87c87a9502baf8065bfdabeca827ea9fa0f274c163bff1e7dc252eabf79ca250c0470d1da5e13492287d28 SHA512 a364e67686cdd4e1e34aa0e14b6cc051ed21a72b63719c47260d7839d47590b9e652be76cb9d61e513c7933b965fc8141c3ff898167e22353b33c9491a525c84 DIST trilinos-15.1.1.tar.gz 183340366 BLAKE2B 4d1184fac143ae2b2950d0bf35bae8f813436f894734e5a9aa96d7622ed265cc41a04001a846437a1d1921258c20ae165e9e55f1754241541bde7136c08a6e5c SHA512 5a1a7d321dd3b47fafe0422884d1a7bf6731d5ee806a4fd1bf31f179ca5d6f4290cda4515d0d7786024ea15c17e88422a9518370c5cfb32b4b44761de232e0de +DIST trilinos-16.0.0.tar.gz 198059287 BLAKE2B b23389d6aa49e34b87f614e9c4a835b224bcd4054028b106c94358a4125a5544df2013ce3560a56e76d68e900df613d7ae002fea0dacd8bd93ea002a4db7d53b SHA512 ed8b9f6ec8d35879f28f066685f70c492ee83ffdc42cfed75750216c0c689c81b00355520a7db441e56d83a6a153b0dbe4f8422d163a942cdcc6786235f64688 EBUILD trilinos-14.4.0.ebuild 7704 BLAKE2B 09d8d1e38b6459d95710939ae94cf4fba101299478fb30fa2802d4a211863e78dd68483486a4c22e3fb245a9cc2c8bbf85c2213be2140e2eaf2e9fcffbf9420f SHA512 470f14adfd2fa1028b94a3017304597c2905e34f4e4bfbf3b3bb1458c78120b1a324ce3b20954770e1fcfb48bf50c62452906d12e483c5a9e7e0e46597a8544a EBUILD trilinos-15.0.0.ebuild 7434 BLAKE2B 86917d4fb4fe2a29893e39b038c88de90fe4715a9655cfe5bb7d4c4980bd8c808255e6acff557420a7972278605330f6498d62c97e655347ba2f1b0a15bb041b SHA512 6894b7fe8a286040d5cc832c69ddea8b0c9ca1b94c085e4320ff92f32c63b65e869684e934db6a6f9725b1a7b6408faa088ceadfc5dfe9c08a35dd859dc31fb4 EBUILD trilinos-15.1.1.ebuild 7434 BLAKE2B 86917d4fb4fe2a29893e39b038c88de90fe4715a9655cfe5bb7d4c4980bd8c808255e6acff557420a7972278605330f6498d62c97e655347ba2f1b0a15bb041b SHA512 6894b7fe8a286040d5cc832c69ddea8b0c9ca1b94c085e4320ff92f32c63b65e869684e934db6a6f9725b1a7b6408faa088ceadfc5dfe9c08a35dd859dc31fb4 +EBUILD trilinos-16.0.0.ebuild 7434 BLAKE2B 86917d4fb4fe2a29893e39b038c88de90fe4715a9655cfe5bb7d4c4980bd8c808255e6acff557420a7972278605330f6498d62c97e655347ba2f1b0a15bb041b SHA512 6894b7fe8a286040d5cc832c69ddea8b0c9ca1b94c085e4320ff92f32c63b65e869684e934db6a6f9725b1a7b6408faa088ceadfc5dfe9c08a35dd859dc31fb4 MISC metadata.xml 2813 BLAKE2B 956cb9f2f1f6061f67d8f02b96498e8b20e9ef5360b9401d42636e25b8e73ea5e8318aa4506fd3af658ab1499870ce101e978bb3198118f54cc75f42f4ca1374 SHA512 9e183b59a017f0f741f0687bf3422e81b41b419bcf2d4e777f262c0cbd3e08ae5ddfca443530d4ea7879f8df9772b4657cb93112c56beed901b2e0fd0201f919 diff --git a/sci-libs/trilinos/trilinos-16.0.0.ebuild b/sci-libs/trilinos/trilinos-16.0.0.ebuild new file mode 100644 index 000000000000..6cbf380341aa --- /dev/null +++ b/sci-libs/trilinos/trilinos-16.0.0.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake flag-o-matic toolchain-funcs + +DESCRIPTION="Scientific library collection for large scale problems" +HOMEPAGE="http://trilinos.sandia.gov/" +MY_PV="${PV//\./-}" +PATCHSET="r0" +SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" + +LICENSE="BSD LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +IUSE=" + adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre + matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse + superlu taucs tbb test threads tvmet yaml zlib X +" + +# TODO: fix export cmake function for tests +RESTRICT="test" + +RDEPEND=" + !dev-cpp/kokkos + dev-libs/boost:= + sys-libs/binutils-libs:= + virtual/blas + virtual/lapack + virtual/mpi + adolc? ( sci-libs/adolc ) + arprec? ( sci-libs/arprec ) + clp? ( sci-libs/coinor-clp ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) + eigen? ( dev-cpp/eigen:3 ) + glpk? ( sci-mathematics/glpk ) + gtest? ( dev-cpp/gtest ) + hdf5? ( sci-libs/hdf5:=[mpi] ) + hypre? ( sci-libs/hypre:= ) + hwloc? ( sys-apps/hwloc:= ) + matio? ( sci-libs/matio ) + mkl? ( sci-libs/mkl ) + metis? ( sci-libs/metis ) + mumps? ( sci-libs/mumps ) + netcdf? ( sci-libs/netcdf:= ) + petsc? ( sci-mathematics/petsc ) + qd? ( sci-libs/qd ) + scalapack? ( sci-libs/scalapack ) + scotch? ( sci-libs/scotch:= ) + sparse? ( sci-libs/cxsparse sci-libs/umfpack ) + superlu? ( sci-libs/superlu:= ) + taucs? ( sci-libs/taucs ) + tbb? ( dev-cpp/tbb:= ) + tvmet? ( dev-libs/tvmet ) + yaml? ( dev-cpp/yaml-cpp:= ) + zlib? ( sys-libs/zlib ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +trilinos_conf() { + local dirs libs d + for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do + dirs="${dirs};${d:2}" + done + [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" ) + for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do + libs="${libs};${d:2}" + done + [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" ) + dirs="" + for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do + dirs="${dirs};${d:2}" + done + [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) +} + +src_configure() { + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 + filter-lto + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON + -DCMAKE_SKIP_INSTALL_RPATH=ON + -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" + -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" + -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" + -DTrilinos_ENABLE_PyTrilinos=OFF + -DTrilinos_ENABLE_Amesos=ON + -DTrilinos_ENABLE_AztecOO=ON + -DTrilinos_ENABLE_EpetraExt=ON + -DTrilinos_ENABLE_Epetra=ON + -DTrilinos_ENABLE_Ifpack=ON + -DTrilinos_ENABLE_ML=ON + -DTrilinos_ENABLE_MueLu=ON + -DTrilinos_ENABLE_OpenMP="$(usex openmp)" + -DTrilinos_ENABLE_ROL=ON + -DTrilinos_ENABLE_Sacado=ON + -DTrilinos_ENABLE_Teuchos=ON + -DTrilinos_ENABLE_Tpetra=ON + -DTrilinos_ENABLE_Zoltan=ON + -DTrilinos_ENABLE_TESTS="$(usex test)" + -DTPL_ENABLE_BinUtils=ON + -DTPL_ENABLE_BLAS=ON + -DTPL_ENABLE_LAPACK=ON + -DTPL_ENABLE_MPI=ON + -DTPL_ENABLE_ADOLC="$(usex adolc)" + -DTPL_ENABLE_AMD="$(usex sparse)" + -DTPL_ENABLE_ARPREC="$(usex arprec)" + -DTPL_ENABLE_BLACS="$(usex scalapack)" + -DTPL_ENABLE_BoostLib=ON + -DTPL_ENABLE_Boost=ON + -DTPL_ENABLE_Clp="$(usex clp)" + -DTPL_ENABLE_CSparse="$(usex sparse)" + -DTPL_ENABLE_CUDA="$(usex cuda)" + -DTPL_ENABLE_CUSPARSE="$(usex cuda)" + -DTPL_ENABLE_Eigen="$(usex eigen)" + -DTPL_ENABLE_GLPK="$(usex glpk)" + -DTPL_ENABLE_gtest="$(usex gtest)" + -DTPL_ENABLE_HDF5="$(usex hdf5)" + -DTPL_ENABLE_HWLOC="$(usex hwloc)" + -DTPL_ENABLE_HYPRE="$(usex hypre)" + -DTPL_ENABLE_Matio="$(usex matio)" + -DTPL_ENABLE_METIS="$(usex metis)" + -DTPL_ENABLE_MKL="$(usex mkl)" + -DTPL_ENABLE_MUMPS="$(usex mumps)" + -DTPL_ENABLE_Netcdf="$(usex netcdf)" + -DTPL_ENABLE_PARDISO_MKL="$(usex mkl)" + -DTPL_ENABLE_PETSC="$(usex petsc)" + -DTPL_ENABLE_Pthread="$(usex threads)" + -DTPL_ENABLE_QD="$(usex qd)" + -DTPL_ENABLE_SCALAPACK="$(usex scalapack)" + -DTPL_ENABLE_Scotch="$(usex scotch)" + -DTPL_ENABLE_SuperLU="$(usex superlu)" + -DTPL_ENABLE_TAUCS="$(usex taucs)" + -DTPL_ENABLE_TBB="$(usex tbb)" + -DTPL_ENABLE_Thrust="$(usex cuda)" + -DTPL_ENABLE_TVMET="$(usex tvmet)" + -DTPL_ENABLE_UMFPACK="$(usex sparse)" + -DTPL_ENABLE_X11="$(usex X)" + -DTPL_ENABLE_yaml-cpp="$(usex yaml)" + -DTPL_ENABLE_Zlib="$(usex zlib)" + ) + + # + # Make sure some critical configuration options are always set + # correctly independently of what Trilinos dependency resolver thinks + # it should be doing. + # + local mycmakeargs+=( + -DAmesos2_ENABLE_LAPACK=ON + -DAmesos2_ENABLE_MUMPS=OFF + -DTpetra_INST_SERIAL=ON + ) + + use eigen && \ + mycmakeargs+=( + -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3" + ) + use hypre && \ + mycmakeargs+=( + -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre" + ) + use scotch && \ + mycmakeargs+=( + -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" + ) + + # cxsparse is a rewrite of csparse + extras + use sparse && \ + mycmakeargs+=( + -DCSparse_LIBRARY_NAMES="cxsparse" + ) + + # mandatory blas and lapack + trilinos_conf blas BLAS + trilinos_conf lapack LAPACK + use superlu && trilinos_conf superlu SuperLU + use metis && trilinos_conf metis METIS + + # blacs library is included in scalapack these days + if use scalapack; then + trilinos_conf scalapack SCALAPACK + mycmakeargs+=( + -DBLACS_LIBRARY_NAMES="scalapack" + -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" + ) + fi + + # + # Make sure we use the compiler wrappers in order to build trilinos. + # + [ ! -z "${CC}"] && export OMPI_CC="${CC}" MPICH_CC="${CC}" && tc-export OMPI_CC MPICH_CC + [ ! -z "${CXX}"] && export OMPI_CXX="${CXX}" MPICH_CXX="${CXX}" && tc-export OMPI_CXX MPICH_CXX + export CC=mpicc CXX=mpicxx && tc-export CC CXX + + # Trilinos needs a custom build type: + local CMAKE_BUILD_TYPE=Release + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # Clean up the mess: + + # Let us move the bin directory out of the way to avoid potential + # clashes due to very generically named binaries such as + # »nvcc_wrapper«, etc. + mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" + + # Move the cmake directory to the right location: + mkdir -p "${ED}/usr/$(get_libdir)"/cmake + mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed" + # Fix up include paths: + sed -i -e 's#external_packages#trilinos/external_packages#g' \ + "${ED}/usr/$(get_libdir)"/cmake/**/*.cmake || die "sed failed" + rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed" + + # Register $(get_libdir)/trilinos in LDPATH so that the dynamic linker + # has a chance to pick up the libraries, also add Trilinos' binaries ot + # the PATH environment variable. + cat >> "${T}"/99trilinos <<- EOF + LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" + PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin" + EOF + doenvd "${T}"/99trilinos +} diff --git a/sci-libs/xylib/Manifest b/sci-libs/xylib/Manifest index d1c72a95cdbd..c3555c38ab02 100644 --- a/sci-libs/xylib/Manifest +++ b/sci-libs/xylib/Manifest @@ -1,4 +1,3 @@ DIST xylib-1.6.tar.bz2 370765 BLAKE2B 76eb968f06a6a015ed7a29a493d888642767cda103733498b8706c973498aa4ac8576716b06f6eae8d95a1f625e9cd91ab02cfd53146d976e32fc9295f3c502f SHA512 9861cbf03f8b921a93a2d32a529ff94d77723e2510cd61096b4b85f91af4be6330ed82e8da94bc45dbca7f9814077360d1dae204315b28c2b6d85e3d2c7f6696 EBUILD xylib-1.6-r1.ebuild 889 BLAKE2B f6c61f229c9468a8d80f52191ba7557c5c0073e30e375f8354f8e4f75db5ae46dc8ae4d3da0f69d869f5252dca15bc4c397402bfe2467917d5271e16f274bbe3 SHA512 bb95791cb9944f9d72f30af29dd3be046311ca1f0213006088b16b5e02e65c8a6eb946dad871740117af81a6e41a1df35b2d99bc92342f293fad087c063e7a5a -EBUILD xylib-1.6.ebuild 807 BLAKE2B e15510175a2dd0013cadda8239039b4ac9a791265142f47f4be44b6538c0499256b5101ea96563cc1c2458a1ca3548b808909f213233bdac1c82df1f9618c574 SHA512 4c09b69be3205c1924a8cef18f4a5ca8fe5cfd73c2e83eb5d795f1c1b36117b2a50e5de8d64de73ccfdc31f7bb544906d645bc816b3669637432725c0d738950 MISC metadata.xml 623 BLAKE2B 09bb7a7f0228b82b17350ba2e3a205e46f81b2e2301071a94c4cc14c57d81468be59f5c2d1ac0df466624a888ec64c6f447d36f4fa6b2ec5efea183fb939d937 SHA512 a1557a7bece9e3c1ef5928cece1b094f2bb95938dd1663c5dc13f02779174766563223c84b8cf6a1e6f9cf7e0a325ff02a639cf778843b4b1ae25ea748053c28 diff --git a/sci-libs/xylib/xylib-1.6.ebuild b/sci-libs/xylib/xylib-1.6.ebuild deleted file mode 100644 index 49e226d26949..000000000000 --- a/sci-libs/xylib/xylib-1.6.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER=3.0-gtk3 - -inherit wxwidgets - -DESCRIPTION="Experimental x-y data reading library" -HOMEPAGE="https://github.com/wojdyr/xylib" -SRC_URI="https://github.com/wojdyr/xylib/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gui zlib" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - gui? ( x11-libs/wxGTK:${WX_GTK_VER} ) - zlib? ( sys-libs/zlib )" -DEPEND=" - ${RDEPEND} - dev-libs/boost" - -src_configure() { - use gui && setup-wxwidgets - - econf \ - --disable-static \ - $(use_with bzip2 bzlib) \ - $(use_with gui) \ - $(use_with zlib) -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} |