diff options
Diffstat (limited to 'sci-libs')
51 files changed, 1439 insertions, 264 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex cbd427d002d0..f330981de478 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest index 8445d982c749..588bd0c683ae 100644 --- a/sci-libs/ViSP/Manifest +++ b/sci-libs/ViSP/Manifest @@ -1,5 +1,7 @@ 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.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2 +DIST visp-3.5.0.tar.gz 52005297 BLAKE2B a429c07c8d80e8790bdd72bf27b777c79784173cc8be2539656c1cfbc111e35b3f80207a866fe3aaca536033af9e9d5006bf7e10a56cef5655aa9615a674c5ac SHA512 5a968a78c8ed2c48da71fa3def482b84fd73961f012e82ea1d7dd9b7b14336be5596ac9fc1bdf16414793d2399431bbc4306710d31b62946e6b2c03f692751b8 EBUILD ViSP-3.3.0-r1.ebuild 2901 BLAKE2B cf2a732151399a31a0b22065058a0dfee83179d2002beffe02b2438308771ece54e6aba0f48e7e49dec9f8190f01a0de1df19c4930e0134d9527e6a656c7c7cd SHA512 f0cb1a66675889d45b459359f7314682c92413fe1a3675438aacbf4a47be421d38c3fbd89c36ae6090b0aefa4f2e14b0ec1d290ce98103e87d7b152b92b24f8c +EBUILD ViSP-3.5.0.ebuild 2890 BLAKE2B e5adb5876af9bf25c9224a4b1a7d7561449b54a3dc6e67d7acf9f096b92a86ab748e2769545b037cf393cfc98b152a6b36d1103382c0e90c82479c2a60fbccee SHA512 dc00394abe4ce5ea86c097717d7f28f19a5052ed1979aa3292f8002935b156ab91e80c7427d6e931ffa75d496d4a9b5435712b0da083f15d97c2f4dc9f2a1b1c 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.ebuild new file mode 100644 index 000000000000..0dfc0c9751a2 --- /dev/null +++ b/sci-libs/ViSP/ViSP-3.5.0.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library" +HOMEPAGE="https://visp.inria.fr/" +SRC_URI="https://visp-doc.inria.fr/download/releases/visp-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/3.5" +KEYWORDS="~amd64 ~arm" +IUSE=" + +coin demos +dmtx doc examples gsl ieee1394 jpeg motif ogre + opencv pcl png test tutorials usb v4l X xml +zbar zlib + cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 +" +REQUIRED_USE="motif? ( coin )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + coin? ( + >=media-libs/coin-4 + virtual/opengl + ) + dmtx? ( media-libs/libdmtx ) + gsl? ( sci-libs/gsl:= ) + ieee1394? ( media-libs/libdc1394:2= ) + jpeg? ( virtual/jpeg:0 ) + motif? ( media-libs/SoXt ) + ogre? ( + dev-games/ogre[ois(+)] + dev-libs/boost:=[threads(+)] + ) + opencv? ( media-libs/opencv:=[contribdnn(+)] ) + pcl? ( sci-libs/pcl:= ) + png? ( media-libs/libpng:0= ) + usb? ( virtual/libusb:1 ) + v4l? ( media-libs/libv4l ) + X? ( x11-libs/libX11 ) + xml? ( dev-libs/libxml2 ) + zbar? ( media-gfx/zbar ) + zlib? ( sys-libs/zlib )" +DEPEND="${COMMON_DEPEND} + v4l? ( virtual/os-headers )" +RDEPEND="${COMMON_DEPEND} + demos? ( sci-misc/ViSP-images )" +BDEPEND=" + virtual/pkgconfig + test? ( sci-misc/ViSP-images ) + doc? ( + app-doc/doxygen + media-gfx/graphviz + virtual/latex-base + )" + +S="${WORKDIR}/visp-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-3.2.0-ocv.patch" + "${FILESDIR}/${PN}-3.0.1-opencv.patch" +) + +src_configure() { + local mycmakeargs=( + "-DBUILD_JAVA=OFF" + "-DBUILD_EXAMPLES=$(usex examples ON OFF)" + "-DBUILD_TESTS=$(usex test ON OFF)" + "-DBUILD_DEMOS=$(usex demos ON OFF)" + "-DBUILD_TUTORIALS=$(usex tutorials ON OFF)" + "-DUSE_COIN3D=$(usex coin ON OFF)" + "-DUSE_DC1394=$(usex ieee1394 ON OFF)" + "-DUSE_DMTX=$(usex dmtx ON OFF)" + "-DUSE_GSL=$(usex gsl ON OFF)" + "-DUSE_JPEG=$(usex jpeg ON OFF)" + "-DUSE_PNG=$(usex png ON OFF)" + "-DUSE_LIBUSB_1=$(usex usb ON OFF)" + "-DUSE_OGRE=$(usex ogre ON OFF)" + "-DUSE_OIS=$(usex ogre ON OFF)" + "-DUSE_OPENCV=$(usex opencv ON OFF)" + "-DUSE_PCL=$(usex pcl ON OFF)" + "-DUSE_SOQT=OFF" + "-DUSE_SOXT=$(usex motif ON OFF)" + "-DUSE_V4L2=$(usex v4l ON OFF)" + "-DUSE_X11=$(usex X ON OFF)" + "-DUSE_XML2=$(usex xml ON OFF)" + "-DUSE_ZBAR=$(usex zbar ON OFF)" + "-DUSE_ZLIB=$(usex zlib ON OFF)" + "-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4" + "-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)" + "-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)" + "-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile visp_doc +} + +src_install() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + cmake_src_install + if use tutorials ; then + dodoc -r tutorial + docompress -x /usr/share/doc/${PF}/tutorial + fi +} diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 1953d56b4a0c..93edbe90c1e1 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,4 +1,7 @@ -AUX caffe2-1.11.0-gentoo.patch 3659 BLAKE2B 3f65ac30ed6ebb4f45ec4abbf0368e5033e2b6bf1ff3bf5a13dfec5d28c803c52053913cfbf1f3576f6b4ac8ff324d79852eb13a2c53ca5ea40915f79edeff2b SHA512 79e82b2dbc4113bc734d6c317e8668d551e8815b0cac41ac1181bcc3e7d285e575539de9ceafaa400c72160a7b1205f3a6975c61ac801e09e4b6dc29a5a1d6ce +AUX caffe2-1.11.0-gentoo.patch 4842 BLAKE2B aab88c5abb64aad74d5c6119dbf6a1e72c3221d9b05e6b8e164f816c2798590f001b6cb3155b5e3bccc03a6a68c4ec9be0dd235de08127959b9adbbc7590a1b5 SHA512 b9498623aead8d5a3096e42adf896f0533903544cde4a1bb9fbb41c83a7921ff25c6c7ef458a280a506bc1555c0519b530a844cd4e537dcf778a2fe50bff50e6 +AUX caffe2-1.12.0-install-dirs.patch 7214 BLAKE2B 16571277e481d71ed63e71793b0aa3179de1ab9fe86483f5af3f6b13cb1eef188925b92579a84989429315edffc9189b25603fb478e505b76bf2923f7aa00566 SHA512 3c247897d0c2471d7c79b0ba05a8786807ff466f3e9c3388175df29c49b5498b0a0e6f3aefea68a8dd36b3fdec3e561799f5d664f8125b6846d00e5f05ced16d DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca -EBUILD caffe2-1.11.0.ebuild 1988 BLAKE2B f671b7eb952e7f890370f810396afba225e08e358cfde43c728f1ee348eb9b8dbbc35f8be7bd2281307ad9fd31e5f914b72b9410340e5c286f2349ba2c5ae0fa SHA512 6adaf278512440ea17e6f31eec7b9f368168ef5f277a4c17c429d5cf790a859ef7fe79bd9b6ec4895158b88014b3450a278edd46e6c9c641cad67b51a33e3c92 -MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 +DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 +EBUILD caffe2-1.11.0-r2.ebuild 4129 BLAKE2B c6c24a81a6ac13e4d0b3601bcdb15656ca4f522fedb9f2c04d2e00fc0639043dc84c7a60a336bf3929e75fb2844e0a6fe632e67d70507ac622b32381b3b3a5dc SHA512 3fa1271831a3d8207e2bb2c1bea79bd16a5590981c0e9d81cee4ce8cb09dbe7bbdf21cc3b88030a04df3025a7de5b6413af81043b888c8b2511d396b0f484e7d +EBUILD caffe2-1.12.0.ebuild 4101 BLAKE2B 0d27cdfc39d70d1fca4a9d0be4c1e06ba3dda7380d68cd1a7bdde264c374f649b6d912644d24f4b4fa0ca8f587ebb204aadcfa3e4b2dac5e3c6999327121f784 SHA512 76c001f31203f927dcb2282134baa29ddcd51e583a8e2ddc892023fb781c7ad509088d737c99eacfc6837f1484e602b9703b29f4f3a6b5391ec0b969330b268f +MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9 diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild new file mode 100644 index 000000000000..6ae8a8dc9187 --- /dev/null +++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild @@ -0,0 +1,160 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-r1 cmake + +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" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) +" # ?? ( cuda rocm ) + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + <dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-libs/protobuf + dev-libs/pthreadpool + dev-libs/sleef + sci-libs/lapack + sci-libs/onnx + sci-libs/foxi + cuda? ( + =dev-libs/cudnn-8* + dev-libs/cudnn-frontend:0/8 + dev-util/nvidia-cuda-toolkit:=[profiler] + ) + ffmpeg? ( media-video/ffmpeg:= ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv:= ) + qnnpack? ( sci-libs/QNNPACK ) + xnnpack? ( sci-libs/XNNPACK ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] +" + +S="${WORKDIR}"/${MYP} + +PATCHES=( + "${FILESDIR}"/${PN}-1.11.0-gentoo.patch + "${FILESDIR}"/${PN}-1.12.0-install-dirs.patch +) + +src_prepare() { + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd +} + +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 + + python_setup + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_CUDNN=$(usex cuda) + -DUSE_FAST_NVCC=$(usex cuda) + -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" + -DUSE_DISTRIBUTED=OFF + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=OFF # TODO + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=OFF + -DUSE_KINETO=OFF # TODO + -DUSE_LEVELDB=OFF + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MKLDNN=OFF + -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_PYTORCH_QNNPACK=OFF + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENCV=$(usex opencv) + -DUSE_OPENMP=$(usex openmp) + -DUSE_ROCM=OFF # TODO + -DUSE_SYSTEM_CPUINFO=ON + -DUSE_BREAKPAD=OFF # TODO + -DUSE_SYSTEM_BIND11=ON + -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_SYSTEM_EIGEN_INSTALL=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_SLEEF=ON + -DUSE_TENSORPIPE=OFF + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir) + ) + cmake_src_configure +} + +python_install() { + python_domodule python/caffe2 + python_domodule python/torch +} + +src_install() { + cmake_src_install + + insinto "/var/lib/${PN}" + doins "${BUILD_DIR}"/CMakeCache.txt + + rm -rf python + mkdir -p python/torch || die + mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die + cp torch/version.py python/torch/ || die + python_foreach_impl python_install +} diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild b/sci-libs/caffe2/caffe2-1.11.0.ebuild deleted file mode 100644 index e0f6d0d772f2..000000000000 --- a/sci-libs/caffe2/caffe2-1.11.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-r1 cmake - -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" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/cpuinfo - dev-libs/libfmt - dev-libs/protobuf - dev-libs/sleef - sci-libs/lapack - sci-libs/onnx - sci-libs/foxi -" -DEPEND="${RDEPEND} - dev-libs/FP16 - dev-libs/pocketfft - dev-libs/flatbuffers - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] -" - -S="${WORKDIR}"/${MYP} - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - cmake_src_prepare - pushd torch/csrc/jit/serialization || die - flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die - popd -} - -src_configure() { - python_setup - local mycmakeargs=( - -DUSE_KINETO=OFF - -DUSE_XNNPACK=OFF - -DUSE_SYSTEM_SLEEF=ON - -DUSE_BREAKPAD=OFF - -DUSE_SYSTEM_ONNX=ON - -DUSE_TENSORPIPE=OFF - -DUSE_GLOO=OFF - -DUSE_SYSTEM_FP16=ON - -DUSE_FBGEMM=OFF - -DUSE_NNPACK=OFF - -DUSE_PYTORCH_QNNPACK=OFF - -DUSE_QNNPACK=OFF - -DUSE_SYSTEM_CPUINFO=ON - -DBUILD_CUSTOM_PROTOBUF=OFF - -DUSE_MKLDNN=OFF - -DUSE_NUMPY=OFF - -DUSE_OPENMP=OFF - -DUSE_DISTRIBUTED=OFF - -DUSE_CUDA=OFF - -DUSE_NCCL=OFF - -Wno-dev - -DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir) - -DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir) - -DUSE_CCACHE=OFF - ) - cmake_src_configure -} - -python_install() { - python_domodule python/caffe2 - python_domodule python/torch -} - -src_install() { - cmake_src_install - - insinto "/var/lib/${PN}" - doins "${BUILD_DIR}"/CMakeCache.txt - - rm -rf python - mkdir -p python/torch || die - mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die - cp torch/version.py python/torch/ || die - python_foreach_impl python_install -} diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0.ebuild new file mode 100644 index 000000000000..a7bc65b359da --- /dev/null +++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild @@ -0,0 +1,159 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-r1 cmake + +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" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) +" # ?? ( cuda rocm ) + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + <dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-libs/protobuf + dev-libs/pthreadpool + dev-libs/sleef + sci-libs/lapack + sci-libs/onnx + sci-libs/foxi + cuda? ( + =dev-libs/cudnn-8* + dev-libs/cudnn-frontend:0/8 + dev-util/nvidia-cuda-toolkit:=[profiler] + ) + ffmpeg? ( media-video/ffmpeg:= ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv:= ) + qnnpack? ( sci-libs/QNNPACK ) + xnnpack? ( sci-libs/XNNPACK ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] +" + +S="${WORKDIR}"/${MYP} + +PATCHES=( + "${FILESDIR}"/${PN}-1.11.0-gentoo.patch + "${FILESDIR}"/${PN}-1.12.0-install-dirs.patch +) + +src_prepare() { + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd +} + +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 + + python_setup + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_CUDNN=$(usex cuda) + -DUSE_FAST_NVCC=$(usex cuda) + -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" + -DUSE_DISTRIBUTED=OFF + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=OFF # TODO + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=OFF + -DUSE_KINETO=OFF # TODO + -DUSE_LEVELDB=OFF + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MKLDNN=OFF + -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_PYTORCH_QNNPACK=OFF + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENCV=$(usex opencv) + -DUSE_OPENMP=$(usex openmp) + -DUSE_ROCM=OFF # TODO + -DUSE_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_BIND11=ON + -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_SYSTEM_EIGEN_INSTALL=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_SLEEF=ON + -DUSE_TENSORPIPE=OFF + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir) + ) + cmake_src_configure +} + +python_install() { + python_domodule python/caffe2 + python_domodule python/torch +} + +src_install() { + cmake_src_install + + insinto "/var/lib/${PN}" + doins "${BUILD_DIR}"/CMakeCache.txt + + rm -rf python + mkdir -p python/torch || die + mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die + cp torch/version.py python/torch/ || die + python_foreach_impl python_install +} diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch index ac74edadab35..505af5e6695c 100644 --- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch +++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch @@ -80,14 +80,53 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") set(OPT_FLAG " ") endif() ---- a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200 -+++ b/c10/CMakeLists.txt 2022-06-19 09:58:51.663356075 +0200 -@@ -107,7 +107,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/caffe2/CMakeLists.txt 2022-07-01 21:56:49.643490049 +0200 ++++ b/caffe2/CMakeLists.txt 2022-07-01 21:57:17.091489479 +0200 +@@ -109,7 +109,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 "") +@@ -967,7 +967,6 @@ + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +--- a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200 ++++ b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200 +@@ -58,7 +58,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/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -481,7 +481,7 @@ endif() + list(APPEND Caffe2_DEPENDENCY_LIBS cpuinfo) + + # ---[ QNNPACK +-if(USE_QNNPACK) ++if(FALSE) + set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") + + if(NOT DEFINED QNNPACK_SOURCE_DIR) +@@ -537,7 +537,7 @@ if(USE_QNNPACK) + 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") diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch new file mode 100644 index 000000000000..d9c403d5882e --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch @@ -0,0 +1,147 @@ +--- a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200 ++++ b/c10/CMakeLists.txt 2022-06-19 09:58:51.663356075 +0200 +@@ -107,7 +107,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") +diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt +index a95bd278e2..4a33b4e4ed 100644 +--- a/c10/cuda/CMakeLists.txt ++++ b/c10/cuda/CMakeLists.txt +@@ -63,7 +63,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} ) +diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt +index 6a0e0e41a1..7582c73919 100644 +--- 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") +diff --git a/modules/detectron/CMakeLists.txt b/modules/detectron/CMakeLists.txt +index bffc074e39..e1697e65f2 100644 +--- a/modules/detectron/CMakeLists.txt ++++ b/modules/detectron/CMakeLists.txt +@@ -17,7 +17,7 @@ if(BUILD_CAFFE2_OPS) + + torch_set_target_props(caffe2_detectron_ops_gpu) + target_link_libraries(caffe2_detectron_ops_gpu torch ${OpenMP_link}) +- 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() +@@ -31,7 +31,7 @@ if(BUILD_CAFFE2_OPS) + torch_set_target_props(caffe2_detectron_ops_hip) + target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS}) + target_link_libraries(caffe2_detectron_ops_hip 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) +@@ -40,7 +40,7 @@ if(BUILD_CAFFE2_OPS) + endif() + torch_set_target_props(caffe2_detectron_ops) + target_link_libraries(caffe2_detectron_ops torch ${OpenMP_link}) +- 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() +diff --git a/modules/module_test/CMakeLists.txt b/modules/module_test/CMakeLists.txt +index f72120d535..c293ce025d 100644 +--- 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() +diff --git a/modules/observers/CMakeLists.txt b/modules/observers/CMakeLists.txt +index 050b8a1461..0309a273b7 100644 +--- 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) +diff --git a/modules/rocksdb/CMakeLists.txt b/modules/rocksdb/CMakeLists.txt +index 78651989aa..52bfd149a2 100644 +--- a/modules/rocksdb/CMakeLists.txt ++++ b/modules/rocksdb/CMakeLists.txt +@@ -59,7 +59,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. +diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt +index bf91460c4b..ebbd476fa9 100644 +--- 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() + else() +diff --git a/test/cpp/jit/CMakeLists.txt b/test/cpp/jit/CMakeLists.txt +index 60b43b81fc..9cf34a1620 100644 +--- 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/torch/csrc/deploy/CMakeLists.txt b/torch/csrc/deploy/CMakeLists.txt +index 61fe8c1bb8..28575979dd 100644 +--- a/torch/csrc/deploy/CMakeLists.txt ++++ b/torch/csrc/deploy/CMakeLists.txt +@@ -80,4 +80,4 @@ if(INSTALL_TEST) + install(TARGETS test_deploy_gpu DESTINATION bin) + endif() + +-install(TARGETS torch_deploy DESTINATION lib) ++install(TARGETS torch_deploy DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index d12749aa5c21..25a171ff1680 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -5,6 +5,21 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>telans@posteo.de</email> + <name>James Beddek</name> + </maintainer> + <use> + <flag name="cuda">Add support for CUDA processing</flag> + <flag name="ffmpeg">Add support for video processing operators</flag> + <flag name="nnpack">Use NNPACK</flag> + <flag name="numpy">Add support for math operations through numpy</flag> + <flag name="opencl">Use OpenCL</flag> + <flag name="opencv">Add support for image processing operators</flag> + <flag name="openmp">Use OpenMP for parallel code</flag> + <flag name="qnnpack">Use QNNPACK</flag> + <flag name="xnnpack">Use XNNPACK</flag> + </use> <upstream> <remote-id type="github">pytorch/pytorch</remote-id> </upstream> diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index 180714201641..903cf0845fd3 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,5 +1,5 @@ DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c SHA512 fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2 DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4 SHA512 1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761 -EBUILD cartopy-0.20.1-r1.ebuild 1872 BLAKE2B 9794536c59aed5a8b2f28195e5425012b82b801d3b67ce7c8c6047e87ca7954f4919a27f2762be273c092e6f1eb69bbf6b55b3e761a8119e5936f17dc68b63e8 SHA512 169937284eee56144f265579af0f175710818dc7c08c2f8c95f7b397adbab4b6e1afaa5bdda72eeda7ad37528fb1c5f699e1690144486b1fdb4be81aeebfc05b -EBUILD cartopy-0.20.2.ebuild 1872 BLAKE2B cef799e4228dad513310095d7dc658991fdd1b0ddab8b7ee7764b6444a7f271eac15c8ee3116a159e44654a8a7596c51b58bc08dc176d1788ab65217a280f92c SHA512 21940423ab40bc699355f920e82c1854b3bc97c2df8e13fc51325c73ba787578889befda6c7ca14ae589c3d076bc42d951b19b7878c0437944d3028db4f0d2df +EBUILD cartopy-0.20.1-r1.ebuild 1874 BLAKE2B e955596b9c373267deca75c209c4467e64e3fa4c59cfe1ce8b486bcca35e8618fc7ca538550409a28a72a6ed52bc3c2be4840245aa7224a50d0466567e791538 SHA512 cfcac803ce9313671b1e106e71cc66ef74bba3455062a31c4ba6e5d04673e7f142405b7cb89841dc2f12faaf10401a6c5857768583dc63a6cc3302ede0478673 +EBUILD cartopy-0.20.2.ebuild 1874 BLAKE2B e955596b9c373267deca75c209c4467e64e3fa4c59cfe1ce8b486bcca35e8618fc7ca538550409a28a72a6ed52bc3c2be4840245aa7224a50d0466567e791538 SHA512 cfcac803ce9313671b1e106e71cc66ef74bba3455062a31c4ba6e5d04673e7f142405b7cb89841dc2f12faaf10401a6c5857768583dc63a6cc3302ede0478673 MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3 diff --git a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild index d1c4f0d5d167..b160723004be 100644 --- a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild +++ b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,7 @@ RDEPEND=" sci-libs/geos dev-python/numpy[${PYTHON_USEDEP}] sci-libs/pyshp[${PYTHON_USEDEP}] - sci-libs/shapely[${PYTHON_USEDEP}] + dev-python/shapely[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] diff --git a/sci-libs/cartopy/cartopy-0.20.2.ebuild b/sci-libs/cartopy/cartopy-0.20.2.ebuild index 10493288f17e..b160723004be 100644 --- a/sci-libs/cartopy/cartopy-0.20.2.ebuild +++ b/sci-libs/cartopy/cartopy-0.20.2.ebuild @@ -26,7 +26,7 @@ RDEPEND=" sci-libs/geos dev-python/numpy[${PYTHON_USEDEP}] sci-libs/pyshp[${PYTHON_USEDEP}] - sci-libs/shapely[${PYTHON_USEDEP}] + dev-python/shapely[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index 287cde1dcbff..c420b9c3d10e 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -10,5 +10,6 @@ DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813 EBUILD cfitsio-3.490.ebuild 1718 BLAKE2B 6b89bbad5bc1876148a9360d47931bc3a03a3475a7860a01c1a6ea8ecd87d117c8f10eeff492664c2c284877b7d613aec1e926b472840dd8023b15bd9b0bc17f SHA512 a046886cb8c0e6ede4581128323f1959d24c27713e45f3443a4bfda7fed80f4917f17071a06acf34c891abe07d089ea24f4774f5cb1448da348c823ade163a31 EBUILD cfitsio-4.0.0.ebuild 1677 BLAKE2B 63c18cc01c1c2037406c01e81d288a56537be3f39b72804306385005d664ac8077ef2db5225b7d585c84351ba6b7995dcbbc6da9dd4a90944acc25635dd56636 SHA512 3137d219a4c46b29f5930a965c10129b125af7887fcf1aed6e9f97e2b5903ef54b32a7984d034e4e98a4c44ab48cc7300c8508d3d0501f9df6575aaf9b10b8f0 -EBUILD cfitsio-4.1.0.ebuild 1807 BLAKE2B 492b65b81b8a2ceb64eb89531b044c8cb5e53c05d58b9d0380101a402789772e97577d7dd39dc3993b5514787ff0eb3b99c0866c71c503eedfc4ca2f0fe2f8ef SHA512 c772fdcb8c8b7c16f07cafe63db94ef7a32b4774d4002b2d43722ed7c3d3cba155e7b50df7c0f029cbf178eab0f61e73444e4d130fc5a204a8d9ba3c80aa307a +EBUILD cfitsio-4.1.0-r1.ebuild 1899 BLAKE2B 2b650aeca35f4c0422c582d761774fa786e5a2615588196d8345f982dd860ab9b7ded096382e7a17064cba0961657cd0f829c3d98261047208963b84c7734156 SHA512 8f9cabd2a9a0099607c5c759c1a2be608168671ef878031a258edfc26b290d936b5a1ba6d9d35507fbb9fbb2de6b9a122b8c1f268841ae33429a9dc74e3ef5d2 +EBUILD cfitsio-4.1.0.ebuild 1834 BLAKE2B 44e3449fb0f3b5548402b87c06dc657923db89f9548714ba0495b7f781e9efeed493cce75fce513f1fd6417d30845d00ea70b0f0b43e807648b0aeccda131da6 SHA512 2d63153560fc18da4558c629d3ca5904ad381d90fae2c3c799dc2d7f619d9300506f1b37a9f7322c9c8225c01f15502e03100edc7c329bca1878e27b84787391 MISC metadata.xml 881 BLAKE2B 2f978abf534047204754f13ca59b712e42fe1e9db77335f132cd323d9ea95bef5aa287ce154f77776617aebd56d52abc8d812fc06b5fa604173de669ce225c8f SHA512 54dc397e396a370b7660240dd0e04bfcc0ff249bdaf82046f89c94fffff552391e219a6314224227858d3343aea54bcb2b56d4cd3e1ae069bee749d5025717d4 diff --git a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild new file mode 100644 index 000000000000..e3858e96e7cc --- /dev/null +++ b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2022 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/9" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" +IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" + +BDEPEND=" + sys-devel/bison + sys-devel/flex +" +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.1.0.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild index 4a55f5bf63bc..fa8f7ebd1513 100644 --- a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild @@ -22,6 +22,7 @@ RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) + tools? ( !dev-util/smem ) " # Bug #803350 DEPEND="${RDEPEND} diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest index 2a49540e3b2e..95128cb3f2cf 100644 --- a/sci-libs/dlib/Manifest +++ b/sci-libs/dlib/Manifest @@ -1,3 +1,5 @@ DIST dlib-19.22.tar.gz 10796236 BLAKE2B 5ca840536f61b38557d39ff6c24d9727f7c494e032d5abf912ccf83f724ecad61ce241126478eeed8b14e33b994af4065b1cfaf17a3b29cfa0dafc236e4c2a06 SHA512 49af41460de9aa270e47ee1d158231e87ffdbbf56ca29a3382dd896fcf81ef04729e59bd9c26eac63fb088cefce651149e5cdb0ffed73bfd6b05127887114d94 +DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199 EBUILD dlib-19.22.ebuild 2408 BLAKE2B ea18c8f137dc925a5fdffbd728c346906bfccb703d597df09bd08cca29d1c655b3897a71557015336c4edfc2ea4bedc65f8c5134007df0ee7871d7a854eb3a67 SHA512 c7cedc466f3ac4af898c797f328c6c095d548c93f1c45be39c55bf326bb783317bbb3fd83bb57f11caae0ac1c51011fa16f0bb3b04a2ae9fe4b4b82313a2dcf9 +EBUILD dlib-19.24.ebuild 2481 BLAKE2B 7811fd1827cb80fa46cf92b4d4e13ebb07d60ae7032b0724aba22f217357b305c8fe1ab4e4b3d72ea23ef66266580fe3702dbdf92ab9de49d6b0b34d6ee460af SHA512 658edfbb9bf1efb2da17a92e91c4c601a69a7078d2754d824e8c4332ea90bd140daa8b7ba185d73f66cd31da59d1feee1ed2ff55ac8e8a13acbb88c48d3cbc35 MISC metadata.xml 1003 BLAKE2B 3c4e623c6abbd4d1ec8a9402009b2d01e6edb547bfd24f03c27853d0386170833553feecc7b0f6b751a3ad4e52f0575a4a87fbcf801a0952fc3d4e5c77645a43 SHA512 2c59cabd74e9433b9b31b96d1f476c2c9200cce51960c09de5ebd7aabbfe4cff1f4449a6a9ecaaf1907f58dd12c04039a9f58f69f2d036bc18bf82b4438cbc01 diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild new file mode 100644 index 000000000000..961c180ef7c2 --- /dev/null +++ b/sci-libs/dlib/dlib-19.24.ebuild @@ -0,0 +1,101 @@ +# 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? ( 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/gdal/Manifest b/sci-libs/gdal/Manifest index b806a8755dc9..f60640cc8cac 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -8,10 +8,13 @@ DIST gdal-3.4.2.tar.xz 13273280 BLAKE2B b40e2978d0841386b52de1ad08cec862c52aab8c DIST gdal-3.4.3.tar.xz 13275504 BLAKE2B 5b1cc2be9c2af7a326dc532d547b1e7d2f9c4af32d8f16998f09332a88a53305243313711cc24fe5d028b8edc131ebccda6daf08b5c67d9a2c55fd4e04fe9cee SHA512 2b97e44b9bd84eb43b4c4894b7b6e748522b2f5e8b6cbecc8247fe5ea862795dd44ba2b52934a83688a949805cee4eef9f1aa66360fb831fea3eae956ab0bef3 DIST gdal-3.5.0-build-fixes-no-deps.patch.xz 5016 BLAKE2B 0d0ef0ccae73f8a903b0ccbf992fa775b394df85a89d86f86ad60187bfce6a87eb8b23a573bd65c0173c0e7cffe3df447cef0ddddfd5aebfcedfbed3e6a7716e SHA512 e32c97e3fef948f2fa9c0f4b7116ccb231554e962380d7bebb433083926fb4e1902b0a3bc243f747c81c95813651153ce2751d8c2de4e8abb096778ffe589a2e DIST gdal-3.5.0.tar.xz 8826500 BLAKE2B 7123ff4a7270b309d458e4a7bd32241cdef53953c305c5027873424794f4ed27d2a4838f86c42f9f84b5174ff499ee5539694c41e906509d21d899ccfe38ff99 SHA512 15d9675ffe5e76fdcb431bef1dce0ed8c23695f418186f37c63f4c7274322924095662bbbc95232d5b4d700704c1c4922d52b419cef5bb67f3bb64ee59654d8b +DIST gdal-3.5.1.tar.xz 8844808 BLAKE2B 38efbc69a386607b10fbe9d0add14716fec68a48c6df60f618c306a25d824b499c8dab6cc3d9f614b57e2e69352be860fbba683c58b5d82970a346aa9699f111 SHA512 d731b2b2bd5d300786e2e0eca296d302fda8bc9c76b41d7e78b728f82bb857c55a0d0ba65ae0ccd3b03c6b5812d0afee07940e4133b4b2c852a384c9fe00a8bc DIST gdalautotest-3.5.0.tar 50442240 BLAKE2B 15005f16530690e584e39b036881c339f147e525e3e0dc39b57d027c493ab89027baa2ea3a0ed148c8fa3ebb7cd53cdb4cf4d53c96d068b5a89caf28165e213b SHA512 723c57425dd5f8acd61795be98b450844b5664b9940d47823829d510b8fb84d1d6db9ca880200d7732a83e7b0f1ae6e33269d8ebd91bf0e7d99e887b5f79aad0 +DIST gdalautotest-3.5.1.tar 51005440 BLAKE2B b6c927f35598a406c186fb834befb6941d3665f924dae77e69191e1190a74ba20153ddf14a5e9e9e0b65e70f3496a67ec9ab60fcfce5a62d8b71f5ed54fecc35 SHA512 50bcaf7dc63c8dc7209b3e6915f5cfd0e6fd6721bc741ac13ef13d485ac7ae4fbf2b59c0e856cbe73b5d9fd787da2859037bf9c3264953bb6fbc8dbbe3662308 EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5 EBUILD gdal-3.4.2-r2.ebuild 8171 BLAKE2B dcb8f1836bd8f40c9c6c78a178e7cbe3bd38934345d2d0dc6a7f4e6057ae4e06b9d7a50f8d3c9e5a74013e2ae6068ea9bbc7c38bfa297731136a9662f946f561 SHA512 d47d70febcbaa9b9e3df4a3eb9d1ecf43f006629e1afec4ef1b399fd9a8fb3664d9a99b7af291ac941137b373e86e4c59cfe6eac5620508f251af658bddf242a EBUILD gdal-3.4.3-r1.ebuild 8125 BLAKE2B e6c3df82d9d1ccd60d57405d17ccb93ffa31353c1738e6adc67cac1faafe01c3da4650d2f4f0ad413c08c7d1bc8cf20e649978a9ac8d500873aa3c0b171d996c SHA512 0e1f00f7607d9b3b7cc6d64ac7e7c7619a6b4eb9c86a5ce102c087703ba36a8c15016fbcc1f196073126b22d2aa6f201a7ece1cd509244d95060946c34b43c1f EBUILD gdal-3.5.0-r3.ebuild 6663 BLAKE2B 90012f3cc1e50719569d6511d463874b8f25b9c3b2851b29b59311dce21d9105e8edd6197af84481a08e25a12d179fde606170cef6662a1c2a3332ae9bc98e6e SHA512 3613cb30254c17f1cb9f918bd4909c460a4483e9e88c264004b21a225a148bde0207115453be6d318b8458be9321e040ae07c493b6e78e524551e26dc8caa061 -EBUILD gdal-3.5.0-r4.ebuild 6868 BLAKE2B 36f8e0a8189936d631ca9028ea0ca220a0b587dae2e21ee6895c182e6a0739ea79d2c80742913343226db9ec1b6069c655b170bb2bdb67800127eb5ae1608988 SHA512 99c93ead2623dde711f4041eb7dc2a283ac6b0328547ffb18ebb4736d7fb34a617a561ca8c74126d1b4e551332e312753920a4065a4a3e312d4df0575f368adf +EBUILD gdal-3.5.0-r4.ebuild 6879 BLAKE2B 7bd435458e65229bdeb871cd30985540588044ec9254f766cec81c58786edfb472df2d8845563a0457741eb7600d3aae0f6230c047abe6b1af3e5d7acef159ba SHA512 0bd2b4e1776bcfa7127d6300d6151702c2d66f7e384f2ee746d269f28d2dfe248db37db626422981b928eb110ea3dec5d7a2814edade458ad313913d75eb0f91 +EBUILD gdal-3.5.1.ebuild 6692 BLAKE2B a8a44e47733f93347ed4945220105df2d3e8c645929a1d72caa30b2288917779ba3098a97564210072683c181d01d65701acb4b9845a7975c6e0797333ad6ea7 SHA512 c6fc38ed6684402f9c030b5f6f893761192019d0301da6dcf2e5bcbc97840580efe1f22902938c677f167f88bf2e28fdc520442d7a59b4dc3fea84acfd0c187b MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c diff --git a/sci-libs/gdal/gdal-3.5.0-r4.ebuild b/sci-libs/gdal/gdal-3.5.0-r4.ebuild index 8133f3f2903d..136791629595 100644 --- a/sci-libs/gdal/gdal-3.5.0-r4.ebuild +++ b/sci-libs/gdal/gdal-3.5.0-r4.ebuild @@ -63,7 +63,7 @@ DEPEND="dev-libs/expat mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) - ogdi? ( sci-libs/ogdi ) + ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) diff --git a/sci-libs/gdal/gdal-3.5.1.ebuild b/sci-libs/gdal/gdal-3.5.1.ebuild new file mode 100644 index 000000000000..1be7580b66bd --- /dev/null +++ b/sci-libs/gdal/gdal-3.5.1.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +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 -> ${PN}autotest-${PV}.tar )" + +LICENSE="BSD Info-ZIP MIT" +SLOT="0/31" # 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 pdf png postgres python spatialite sqlite test webp xls zstd" +# Tests fail to build in 3.5.0, let's not worry too much yet given +# we're only just porting to CMake. Revisit later. +RESTRICT="!test? ( test ) test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + spatialite? ( sqlite )" + +BDEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + java? ( + dev-java/ant-core + dev-lang/swig:0 + >=virtual/jdk-1.8:* + ) + python? ( + dev-lang/swig:0 + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" +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] ) + 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:= ) + 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:* )" + +pkg_setup() { + use python && python-single-r1_pkg_setup + 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 + + # 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=OFF + -DGDAL_USE_PCRE2=ON + -DGDAL_USE_PDFIUM=OFF + -DGDAL_USE_PNG=$(usex png) + -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) + ) + + 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) + cmake_src_test +} + +src_install() { + cmake_src_install + + # TODO: install docs? +} + +pkg_postinst() { + elog "Check available image and data formats after building with" + elog "gdalinfo and ogrinfo (using the --formats switch)." +} diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 19a50be1547e..d7b358a3ebb0 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,5 +1,7 @@ DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b143e12e861d02124421985a8b2c966bca6f966aa167fb60f703d25c132b8c7ee4d61e382a449bce5eb40d4cb89 SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e DIST geos-3.10.2.tar.bz2 6714655 BLAKE2B 1bc4f29a28b2b49faa9e1ea2aba7359d6dcb124136e0a2d2069508f7b95fae09e59ecb0acf3742d9261444055e85471cf45baba6e278c8b3501e91eacf3bb886 SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126 +DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 EBUILD geos-3.10.0.ebuild 887 BLAKE2B 3653d5849387cd8890c49f497fa263961320af636ccf723ac9ec2ce77dc29dd184aa2cc954d28836d6458ba2471096d351bfa1873a62fd8dd1326e170470e186 SHA512 298d9191f68705e2bdff66b74876277e97ba218d0611a6c03e5de00afe4e59a6819712a9817a6fcc419e8a867aaeb8678ebe261bf352c90a93bf14020f67bb1b EBUILD geos-3.10.2.ebuild 888 BLAKE2B 0d4032484b9f7b978ede5881ff5c2b088b03141e953d7c570da8dbd1ab46cf02ab016f61724e0d2fb6666dabaf1dbc0d2146fe882ac7b6324c5905c6652f2e8d SHA512 50c4dc2607998f0f7ff21710a891d630a52175f679be31f390687c3294b790c166870ecb8dc62e8f10194665d0169776517ebab295c688a82e3ccd94e364d783 +EBUILD geos-3.11.0.ebuild 975 BLAKE2B 859c4231c089d683eb74cddf666bc314ec7014047c3e3c6de29859a6102868a2cc0c0ab42994bbe4783ded6d5b8cb28cf54f14c5516b76ae87a8e1ed7097fac4 SHA512 aaae02227cb87fc91bba5e3e8181c8e0765294bfade3427e0cd784974011d7baf41bdcf98eb4899ac3d21def745679477f74a31efa6633c92e5b3f0812029366 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452 diff --git a/sci-libs/geos/geos-3.11.0.ebuild b/sci-libs/geos/geos-3.11.0.ebuild new file mode 100644 index 000000000000..c18104f4fc50 --- /dev/null +++ b/sci-libs/geos/geos-3.11.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Geometry engine library for Geographic Information Systems" +HOMEPAGE="https://trac.osgeo.org/geos/" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND="doc? ( app-doc/doxygen )" + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DBUILD_TESTING=$(usex test) + -DUSE_CCACHE=OFF + + # bug #709368 + $(usex arm '-DDISABLE_GEOS_INLINE=ON' '') + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile docs +} + +src_install() { + cmake_src_install + + if use doc ; then + HTML_DOCS=( "${BUILD_DIR}"/doc/doxygen_docs/html/. ) + einstalldocs + fi +} diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest index 1b93996cac29..dd7338b51e18 100644 --- a/sci-libs/hdf5/Manifest +++ b/sci-libs/hdf5/Manifest @@ -14,5 +14,5 @@ EBUILD hdf5-1.12.1-r1.ebuild 3468 BLAKE2B da5ba395f8971076a6a3186332f94446dadc7b EBUILD hdf5-1.12.1.ebuild 3144 BLAKE2B 2bd023c0ade920fc795f4434260318095a34b200ddb6a458a6ee7d647fac79d4e31029f93a0d2aafede8682e515a9f9c9db46b5a976f07cd83d5086f77538079 SHA512 10ce8493fd3fa421d8c71267e7c57adaac490244742ed93166ce634f5b956b392efb3b86814c17ad8bfba3347c4e3be54b5688b8eec3af848f1d13c341bb8bcc EBUILD hdf5-1.12.2-r1.ebuild 3389 BLAKE2B 536c7a51533849c8b19f2a086b35352a9a845d89417ba10464ef53b0ee444fcab2fec0e369d5bdf9a1aa4746c0f004726200db1b60b67b3876eb425504d6d173 SHA512 1ccc6ce4ca8712bdd39d79e5acd82886a592d0578f14162ed374675e9bfcd2e8fe838354acea030298b340c9fac22f250913e205a9e943a4919237c0603766cc EBUILD hdf5-1.12.2-r2.ebuild 3456 BLAKE2B d59c684d4494e7f7f484dc87297ef1465998a8f9d75c2cf268e1d689353fd5e092c27dd0a61907ffe11cb35c424e2f9e972a7e3770f0938808bd704cdeca7961 SHA512 4e0b609458298ab12214aa68bb298063d35f64c12c4eff0cc656546b930dce5cc5891e9cdd6d030f7d616aa4ca13386dbbb020970cbea6d939bbe2356fb310ed -EBUILD hdf5-1.12.2-r4.ebuild 3139 BLAKE2B 7a307b26c007fdfdb84e2eda430093fed044854c40330b0d584dfce5fc51f17c6a73db07369ea4f002ced8634b00924d8a2e99ae8ed135aee870418d45cae456 SHA512 6036a8152dc08610784596c616acc72822f095daea25f90ed907ff1683f7b9d7e8e0449bc9f3b36a89cfaf6f63b9fe4ef621f5ec76367996a7df82adbf50e5f1 +EBUILD hdf5-1.12.2-r4.ebuild 3204 BLAKE2B ada053b045e22d132e89cc69c8da16a1edb7f66ced8065709f270580649d51ac01f9de83bd9ccf74e562b373fb81a412d8e1868b57e9fc9c9b88e48bd0351b7f SHA512 16e8eea41894647e1769d2771ec2952d6767c70ea2eed025853733075dd9ec364bc2005c045987501dcd7e3a8ae44806eb8580b0027c26985556654cb8a2b683 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b diff --git a/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild index 7cb1b8716025..1de5129ca19f 100644 --- a/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild +++ b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild @@ -20,10 +20,13 @@ S="${WORKDIR}/${MY_P}" LICENSE="NCSA-HDF" SLOT="0/${PV%%_p*}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cxx debug examples fortran +hl mpi szip threads zlib" +IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib" REQUIRED_USE=" - cxx? ( !mpi ) mpi? ( !cxx ) - threads? ( !cxx !mpi !fortran !hl )" + !unsupported? ( + cxx? ( !mpi ) mpi? ( !cxx ) + threads? ( !cxx !mpi !fortran !hl ) + ) +" RDEPEND=" mpi? ( virtual/mpi[romio] ) @@ -95,6 +98,7 @@ src_configure() { $(use_enable hl) \ $(use_enable mpi parallel) \ $(use_enable threads threadsafe) \ + $(use_enable unsupported) \ $(use_with szip szlib) \ $(use_with threads pthread) \ $(use_with zlib) diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest index 0d4542dd7788..3cca3a6d105c 100644 --- a/sci-libs/lmfit/Manifest +++ b/sci-libs/lmfit/Manifest @@ -1,4 +1,4 @@ AUX lmfit-9.0-cmake.patch 1599 BLAKE2B e0f4783b64436845a12f8ca0a45f93d4964dba3855adeb73cb466c1bc0b8652610f8fa610e816db33c0f027db0b86233c01358245cd42a2284e718b76c964b18 SHA512 7256873a0620a429c231cdd296a6dcf6dffd4caa2468f7a91ca0d3943488753155aeb32bdc5813e1404c52ca2ea9bdf48b7ecf736e1348a1b36c0fd8d555f0c3 DIST lmfit-9.0.tar.gz 36686 BLAKE2B 34d77a9101dcea1387df09e58cf8b69e51b1961ba8f1f73ac070abcc4c6ddbf1a1cd1f4bf2568942442f0c4c3815288959259c16e505ad1a91a4db2a2753bed6 SHA512 523d18c75498f5586c55e6dfcab8d1005aaef61d60e8d482814ced4f90bcd14d72c53ee71ed1991651d38845cce67e3da756fab9500431d6f435fa5ad998c2b1 -EBUILD lmfit-9.0-r1.ebuild 504 BLAKE2B 656f6bfbc4f531e727e9234d5c77248f220c3440ea6a154aff5d6a843c3d0bd6bac71e5367b1201d89f3441bf99252fa7ad941a3e829b2186c70fc275b1c7d1b SHA512 8b2a4f817175aba9c8b645a984ea86e7ed76105a7974a5c6ef63147b2fc807570869f734efd780e76ff09a485dc52693e53ed19ae9b6d2f62860551611d07d0a +EBUILD lmfit-9.0-r1.ebuild 511 BLAKE2B 2e7e9f2c2c03312bab8bc69ee39d364bdc98bd775d78f6a6f36d82d76aa77f74415f01e9a23734fc32511ea24c247f393ae8347dd94d60e4cfe040f33e876d31 SHA512 e57dca400bb03808f915b35292b77d329a41f4271c45aa19120ada275adf96af13d98950b005eb26ac17202e6b654ef88d6c85341f53434c5307f10bfffbfcfd MISC metadata.xml 329 BLAKE2B e14c94d390f181a254eddb7c0ae891c9b736ac30346be5caeba754b9439f17391b5dd1bcabfb58a486d53c9ab4403afaa1b86ecda1c9378b99859a8a01f000d4 SHA512 adcd5f27f011b23bed7d73d3aa88a43d6ed85760e47c0cd8bf89aaf3ab0e7524e52203ea0bba95c6c44d1146998f7e3adcf5430220866c7da9880c0008a9e7d7 diff --git a/sci-libs/lmfit/lmfit-9.0-r1.ebuild b/sci-libs/lmfit/lmfit-9.0-r1.ebuild index 7baae01cb681..f3a316505f1e 100644 --- a/sci-libs/lmfit/lmfit-9.0-r1.ebuild +++ b/sci-libs/lmfit/lmfit-9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0/9" -KEYWORDS="amd64 arm x86" +KEYWORDS="amd64 arm ~arm64 x86" PATCHES=( "${FILESDIR}"/${P}-cmake.patch diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index e2e8b64076ee..c6d9a303950a 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -2,5 +2,7 @@ AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412 AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263 AUX med-4.1.0-0003-build-against-hdf5-1.12.patch 4749 BLAKE2B 3a606c27bce6130e83989dd4e16733ced50da0ef21dd40226ffb6f64abbd5f2eca2174f971b4bbf3204df0e6040b86706c007dbf6b821a5bb287b648078d9113 SHA512 ba2fa24e3aeb2be6fa1e7365d7ac57c9ebd8706dd19de7dba67507baafe1f48b7b00051169f27164b4a9e749816220619490d5f0796a0c02f25644569b26f366 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8 +DIST med-4.1.1.tar.gz 50506725 BLAKE2B fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1 SHA512 8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768 EBUILD med-4.1.0.ebuild 3341 BLAKE2B 8228252546d19d0e40db39d95c64f369249bc613b329f2f3e0f1abdc40a1562313330b0d4a5cd3d8aa9b4c6945a12eb783835940f67bc3d28d3b8ae6bf15c65c SHA512 498fcb9efafb20912faac9ca627aa6c2ac16bc288d2043043ead1c5a479f23142001f02d71b9e7a5e796f0536bbc2d2273624e7d7c95845cb7e54f6b95a23474 +EBUILD med-4.1.1.ebuild 3335 BLAKE2B 9e42135cba6f9861aa3a136eebd5824719d04f20bf87f372ebced24f477ed2cfc692e6b28e7ae39f0f6d140aa9488c410abf6fd1e7decf812b24a203f2df32c5 SHA512 762d5fa162671d8cf96b45c52419c8954431c35771cfcdae62d9838606f62d2d4502928744b9907f6a60aef3602860d7da222e1ea0be0248abb30ca9a5cd0c4e MISC metadata.xml 636 BLAKE2B de5e1c1d3f715459d5ca0945d0d795c1c549e6e20c27283140190bdc24289f4ccc0c12940e00aa689b90fd9af53749f0eabab44cecaf6815ef37adc1795f43e9 SHA512 60a3c3afd0db34569993b73d795830d86eb51778f9a7f0375d0b196c6f0862ca10a77c4c33ad2c906c56c6715be6f4452b61ffab5a25c254e480e50b64c021e4 diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1.ebuild new file mode 100644 index 000000000000..636cb55f6c71 --- /dev/null +++ b/sci-libs/med/med-4.1.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake fortran-2 python-single-r1 + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/user-section/about/med" +SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" +LICENSE="LGPL-3" +S="${WORKDIR}/${P}_SRC" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fortran mpi python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test ) python? ( test )" + +RDEPEND=" + !sci-libs/libmed + dev-lang/tk:0= + >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] + mpi? ( virtual/mpi[fortran?] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" + +PATCHES=( + "${FILESDIR}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" + "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" + "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.12.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + if use python; then + # fixes for correct libdir name + local pysite=$(python_get_sitedir) + pysite="${pysite##/usr/}" + sed \ + -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ + -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" + fi + for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt + do + sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \ + "${cm}" || die "sed on ${cm} failed" + done + sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" + sed -e 's|doc/med-${MED_STR_VERSION}|doc/med-${MED_STR_VERSION}/html|' \ + -i CMakeLists.txt || die "fix doc path failed" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, + # so let's avoid rebuilding it because it will be different + -DMEDFILE_BUILD_DOC=OFF + -DMEDFILE_BUILD_FORTRAN=$(usex fortran) + -DMEDFILE_BUILD_PYTHON=$(usex python) + -DMEDFILE_BUILD_SHARED_LIBS=ON + -DMEDFILE_BUILD_STATIC_LIBS=OFF + -DMEDFILE_BUILD_TESTS=$(usex test) + -DMEDFILE_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + -DMEDFILE_USE_UNICODE=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # we don't need old 2.3.6 include files + rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" + + # the optimization done in CMakeLists.txt has been disabled so + # we need to do it manually + use python && python_optimize + + # Prevent test executables being installed + if use test; then + rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables" + if use fortran; then + rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" + fi + if use python; then + rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" + fi + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake_src_test +} diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest index f6081120bd30..1b7391246775 100644 --- a/sci-libs/nlopt/Manifest +++ b/sci-libs/nlopt/Manifest @@ -1,5 +1,5 @@ DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2 EBUILD nlopt-2.6.2-r1.ebuild 2307 BLAKE2B 9c57f104122725bb2660bde7259ff187256d26cffbb4f0bd399acd2b07dcbac522ea4c83ea2196c84a274fe3c188ee61830e0e09d93505a78df1d74618505364 SHA512 858cc72c427ec512c1ef07619fc44230b1b5fe9b1ca68899341a80c13db7a9a1ac82cc8a8dd3d419a832519739ec672361ee3acdb058f31140df9195101fefd9 -EBUILD nlopt-2.7.1.ebuild 1991 BLAKE2B c3e17104cf44dd3a64fe4a3e2bbcc348b27e4e3d465d1098404317d29a836e8ddb5efa3e443edb86b18250efe2668bdf08107406c6bf2ddce957e864f3dd3c73 SHA512 b94a753fcab605f2549f19d348736cef3a0d9017a71af65fec1b81555286b856ec888a7962ece98c67e03b5e16048c737e1643947eaa2fcd6528791640655991 +EBUILD nlopt-2.7.1.ebuild 1989 BLAKE2B 9250bcd302e71a9d261930c8ec91646d5b9981a9aaec70274bc1e2c006f15e40d787c6ba7c7f02fbd31cf9c47144fb7a97017954d9ffe0ca9845a7b6914a479e SHA512 d618cf5a1f7ee9d41e6cc7e9a5756b9fa59668bade2428bbcae8a4f4e782268e095f9dbdeb95eaee0c23aa1c5508f18cdde7b869328063f1becb8c13d278651b MISC metadata.xml 1096 BLAKE2B 2b35b6f79c882fbae26b6bc68c75e30b0e2d48f540696cbbc48f06c2686e89a1a5f582d59d2c1ee3b47d5f813f4dbc20cd1d35228c7f968e327e41bb2f1f4da9 SHA512 5776b4b8faa1a6406f1d65bcd9de9ce4087580d98b5c3272804d442905c34d64c6e7d632022425e6e13b12161c94a99906a6196c3624b5b9b4aa1eac6fe9aa1e diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild b/sci-libs/nlopt/nlopt-2.7.1.ebuild index 814c7a1440fc..10e6b998d4e3 100644 --- a/sci-libs/nlopt/nlopt-2.7.1.ebuild +++ b/sci-libs/nlopt/nlopt-2.7.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt" SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="cxx guile octave python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest index 95ddcb2d8ea7..e5c06b97ef01 100644 --- a/sci-libs/octomap/Manifest +++ b/sci-libs/octomap/Manifest @@ -1,3 +1,3 @@ -DIST octomap-1.9.7.tar.gz 1684088 BLAKE2B 357b574f770d553a51c936c84772c729754a822e1c1e840a179a2cb3d3ef1b15f1c7173a4333b1262b10aa5d2f64d1b1c063ad90d4cc0edfcbaee9799ceb24a8 SHA512 639ff65cf020865d5302ba9785089782aec1e46496982c11bbf86919b6938c01c7921d84e60880091b89a949dd05f4d1151871f63503d19342462b74e6791ddd -EBUILD octomap-1.9.7.ebuild 1601 BLAKE2B b3e8132cf65668da2937c6d3d593a2249bb9b97eaef797bc92d52748595dfe2bf3d5fdacf0bdcfc47c5ef453016d246d0f71000487701443b3f384730abeaad1 SHA512 13bdaee3002f14d2467ed5a6a15f50c5183caee0c9e7bc5c31eb4683d416f076a47b30d63da4274db721054c0992c7db9c8e9d40ff6ccce8eb83621098ae53ea +DIST octomap-1.9.8.tar.gz 1693311 BLAKE2B 476e4a644287e5ebcaa36de3051b7a2079b733bee3cd80b192fecfab0a85c5de70e3ad087a6cb499141167c735692de72ba2a7b1fb8b318e461f8f21f20020ae SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e +EBUILD octomap-1.9.8.ebuild 1601 BLAKE2B 1ed5a9c9c429e620a2098770021eb0e0e5c13c76701cde8f8587fac17ff67416ccba26763c0d032f5e0ceb75016001cbee5c063e7b88c8fac887f0be1f0a2543 SHA512 4c16de5713fc1629195c01f21fad57672ddb089603d843417f895f9d0c513feb6db4d1b871c49d78657298db00f98e3810c895f227138a75bf6e4ca0aeb9bbbb MISC metadata.xml 704 BLAKE2B 937b95943da6b4415d672c0b609d58cbd60c319cb54e738dbaa23774dcddffea29bb5ddb43dc4aa0662c1c7f4bdc38e4e1c4bd05c4a4f6eb71bc966a90e07261 SHA512 4cc198b5a0d8d8aa65bac1fdced860288c51120fc7fc7ff74bf67e364e52081eb61597ec1fa5a9c8437fde6ec6365b95e08d08ff079ab2e7c69f5c2182843318 diff --git a/sci-libs/octomap/octomap-1.9.7.ebuild b/sci-libs/octomap/octomap-1.9.8.ebuild index 9d9bd32c85f7..0902d3e3b2a0 100644 --- a/sci-libs/octomap/octomap-1.9.7.ebuild +++ b/sci-libs/octomap/octomap-1.9.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest index 38cfecf35162..169bc705ac54 100644 --- a/sci-libs/ogdi/Manifest +++ b/sci-libs/ogdi/Manifest @@ -3,5 +3,5 @@ AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe435 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8 AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859 -EBUILD ogdi-4.1.0.ebuild 1299 BLAKE2B b0c013ce813035f657f2e4630b2ee664be67d84a45d04e5419c61a6e30b28a6801040f31ab4dd412a23bf52ec3277315c07e49c58fdc84830bf04d488494a24b SHA512 517d39b3e64d1964b0af9c208c6db6779dd6cc7652b5dd5374768aba7233d726a6ad74bc0cf6b5d6982047a6bff95708bbc5dc8b64ecfe94f47fbfd21514e993 +EBUILD ogdi-4.1.0-r1.ebuild 1378 BLAKE2B 617e9ba313770b0a84b855fc26aaf715a1aaa8432c18f1ec3ed1fde28d5fc326336d0cb3acf49eeea21a3e1ed80fba3e83f215294c86bca5036eb0c0f1f2862a SHA512 6851b63d960b9da4c66f6d606f698cc809393e37cb09c0ab5c469f224594a937c13fa81ec503094067340a72706d8d5c77b958f67e47138227606bb2fce3b9d7 MISC metadata.xml 338 BLAKE2B ebaad9e5a8ca2e2e604eab4fcf9c65774a5ee60eb5d937bd1b7e2f95f60f9d41f528ff8688cf85399cc9220b65fbeaaa8977937425733193dd57bf64c3880c00 SHA512 8408f1fdfa99c7ed449e0f14129ec260f9c166e16db9e775cc245735f733da3968a4ada840f2409d6fa8e7121e99e91dbe02fcf9ac28c5f8598e93db3298d551 diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild index 8a821d13f953..72f6e8d93cd2 100644 --- a/sci-libs/ogdi/ogdi-4.1.0.ebuild +++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -53,8 +53,16 @@ src_compile() { src_install() { mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed" dobin "${S}"/bin/${TARGET}/* + insinto /usr/include doins ogdi/include/ecs.h ogdi/include/ecs_util.h + dolib.so lib/${TARGET}/lib* + + insinto "/usr/$(get_libdir)/pkgconfig" + doins ogdi.pc + + dobin ogdi-config + einstalldocs } diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 4acd576b8054..5f62cf67a0f6 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -3,5 +3,7 @@ AUX pytorch-1.6.0-global-dlopen.patch 592 BLAKE2B a5e3742fcb0cf2286a9406e11bade1 AUX pytorch-1.7.1-torch_shm_manager.patch 441 BLAKE2B 28b87353a0afa0ef25c8ab00e204998b4fb3472fbbb5bb2b300a3fb22d864846d51ccef652ce331484c7a522f7d74e6674c1ceaf26d0a4956d1c8b57b29a7428 SHA512 08f2e5f35768e70713a1432797d9fbe0b133a80ae7dff2898e4b9b51ab398f88bce90a0698b3c9f77bf8a4c5c054911c22931d0684276a0b6d4f2afb69633088 AUX pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch 1063 BLAKE2B c93cb4c1ff40ef332cd518474a397e9b61d310f4cbdb8701c18749f103533a69e4a3e892f1e3613113cc97ae320951dacb956025ba6be694c5275448d2af3a78 SHA512 7931a220068a36b15ee0f282161f23422acdbef32990bd1eafeab55e06131748f5b4ad93e6a0dc7a4f92e7ebd0595a97835c768b46dd7139f626df666642ce18 DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca -EBUILD pytorch-1.11.0.ebuild 1342 BLAKE2B f3b4cffbd3d282facdf8965ae43d079edb68171966c909ba7d3757e6557aa9a5bbb35fb88a35efcb511bfa52fd67f88c657247b37597d179cd327eb1fb498b77 SHA512 f33c3cd6c6aba09dd58109589bf34fc616aba285851d1b7eb3cfcd7c7cf1abeff8a343064fb9af5ba4ee91c0d238c0beaad790d51bcf49f47391b6b2285c16dc -MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 +DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 +EBUILD pytorch-1.11.0.ebuild 1501 BLAKE2B 4baa78a8da6c8a2c89bbffbf6ed9ed4d502d667e47c9f3cfbcdde10303dc492b72ad3598d929b84287654759dcf3d10ae8b4e10ed772b461fa52ca962502398c SHA512 3b92ed486b9093a9b5ea91fa24bc5fcc01ed84dd9f892f4c387b209b234d2302c6a67bfafd385be3a935305681074a352cc4ec37655945032b9af0ffbe90bb00 +EBUILD pytorch-1.12.0.ebuild 1342 BLAKE2B f3b4cffbd3d282facdf8965ae43d079edb68171966c909ba7d3757e6557aa9a5bbb35fb88a35efcb511bfa52fd67f88c657247b37597d179cd327eb1fb498b77 SHA512 f33c3cd6c6aba09dd58109589bf34fc616aba285851d1b7eb3cfcd7c7cf1abeff8a343064fb9af5ba4ee91c0d238c0beaad790d51bcf49f47391b6b2285c16dc +MISC metadata.xml 842 BLAKE2B 1f6555b3028b9a3480dd4ae4d96d872c6a1f3942a36f9b6b327010682a8f2d9d6ab77728c4622c07580d2d6cd3d1783d3a473cdbad1976497bac834ab9be55fd SHA512 f7f7bd8788ca8ab345f1319dff6cd2e7aec0f3764f6f69fcd75f5ec54ba1b38287ac06767b305ffbab3a1ea16eb117f86e35a803e53258b82d5184fd0dd50364 diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml index d12749aa5c21..bc2785e5f6db 100644 --- a/sci-libs/pytorch/metadata.xml +++ b/sci-libs/pytorch/metadata.xml @@ -5,6 +5,17 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> + <use> + <flag name="cuda">Add support for CUDA processing</flag> + <flag name="ffmpeg">Add support for video processing operators</flag> + <flag name="nnpack">Use NNPACK</flag> + <flag name="numpy">Add support for math operations through numpy</flag> + <flag name="opencl">Use OpenCL</flag> + <flag name="opencv">Add support for image processing operators</flag> + <flag name="openmp">Use OpenMP for parallel code</flag> + <flag name="qnnpack">Use QNNPACK</flag> + <flag name="xnnpack">Use XNNPACK</flag> + </use> <upstream> <remote-id type="github">pytorch/pytorch</remote-id> </upstream> diff --git a/sci-libs/pytorch/pytorch-1.11.0.ebuild b/sci-libs/pytorch/pytorch-1.11.0.ebuild index 0a1cae78f4bb..401bdea8264a 100644 --- a/sci-libs/pytorch/pytorch-1.11.0.ebuild +++ b/sci-libs/pytorch/pytorch-1.11.0.ebuild @@ -16,11 +16,13 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" RESTRICT="test" +IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack" REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND=" ${PYTHON_DEPS} ~sci-libs/caffe2-${PV}[${PYTHON_USEDEP}] + sci-libs/caffe2[cuda?,ffmpeg?,nnpack?,numpy?,opencl?,opencv?,openmp?,qnnpack?,xnnpack?] dev-python/typing-extensions[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} diff --git a/sci-libs/pytorch/pytorch-1.12.0.ebuild b/sci-libs/pytorch/pytorch-1.12.0.ebuild new file mode 100644 index 000000000000..0a1cae78f4bb --- /dev/null +++ b/sci-libs/pytorch/pytorch-1.12.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit distutils-r1 + +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_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/pyyaml[${PYTHON_USEDEP}] +" + +src_prepare() { + eapply \ + "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ + "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ + "${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch \ + "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.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 +} + +src_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + USE_SYSTEM_LIBS=ON \ + CMAKE_BUILD_DIR="${BUILD_DIR}" \ + BUILD_DIR= \ + distutils-r1_src_compile +} + +src_install() { + USE_SYSTEM_LIBS=ON distutils-r1_src_install +} diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index 6fcc4a1563c9..6c83b4c96feb 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -7,6 +7,7 @@ AUX rocBLAS-4.3.0-remove-problematic-test-suites.patch 2240 BLAKE2B bdaf0111083e AUX rocBLAS-4.3.0-unbundle-Tensile.patch 863 BLAKE2B 223d7b54d61111443c9f90d66a2d53bc85414094a2b9c571d2e6fafc0d1260befb0783d6c761d4df0b22c31a4e85a029f5eed5d9d455488207791fdaa1c69952 SHA512 40e7cc604139b419b9a77ad1005a8bbfd1134909f2e0be67579dcc958d49c8239b1b7f573741c9ff04e310977fafbd2edce5b58f4bc4bffb2cd003e7fbab7437 AUX rocBLAS-5.0.2-change-default-Tensile-library-dir.patch 2070 BLAKE2B b90c31653c68583432f54c3a17067a92e7fd91e66f902f37e96a7a413b885de57820b93c5a98458b1d6f4b4283138dac274ece1ec97f3fc0dd3ea00ce6002542 SHA512 946f9d66ac703628829ff585890ea9eae71f441e10bb1ff21f8dfad9a5d73279ed4880c4b96ac662be76af10ebe63ccbe0ef9f2c55fb2ebfc5c9087f32119b2a AUX rocBLAS-5.0.2-cpp_lib_filesystem.patch 1546 BLAKE2B e9a794a87b76a41d059c755565ae5da9a361b0c4648a92dd5ce35f9b5bd8c743827fcf79752c393a786c30083cd7db59bc334599d414920ce72c24216d014124 SHA512 e80ac744ce44bc9023de2600290c37577bda6161bfe750ac2b746d8fea7b45334a96461baa74131d0e31db497f8dd123ccd5dc181a40b265c2e2c72e1e479e88 +AUX rocBLAS-5.0.2-respect-makeopts.patch 3409 BLAKE2B dc97390feba6ab3900ec18fd7b86d4bb25baff4565ccddf0dae025ab5fa8330f16a2dddb1055c32be7132581e9aa1a83ff1e3c77cc69f5f6c641c1e40447fffc SHA512 63ffde4f98f3f3e2d72e11f3877640b2b525c25e8730b3497be97d71dae4b2f9b08c351f548356c9011c1767d5a451badd790963d773a45946994a48e5810b29 AUX rocBLAS-5.0.2-unbundle-Tensile.patch 1352 BLAKE2B 48300030abee9898397919cbbea187fd16d770e20cdcfddd7665c160f47e362ad63acf9f443f86d824a999398d0c6f5aee8295a963dce2653bc94518c8ac9674 SHA512 39c4aff4fc60692e0450aa844ce979afe031c3ba3adb0cdf0866d0766714bf28a4c5664c18de7520b63d3fc2864de51939a596e864e97d0b8935681cabd7a84d DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47 @@ -14,5 +15,5 @@ DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e1 DIST rocm-rocBLAS-5.0.2.tar.gz 13295178 BLAKE2B e1abfa06b9ac1545732465857839dae3f3708af49439a306a2b5b1b1b392101c38c95815f2c05a0d9ed29d41b154bc2e16a4f9203a37f5e2f68ee12cc4b44a06 SHA512 2f4a74f49350ede0debcf32229a6b6b95505615723c3f2bee16e4c169a3bb966dfb1971819028f47c525f571bea5662b892e63f655b0d1d2b8f20746bc5fe770 EBUILD rocBLAS-4.3.0-r1.ebuild 3897 BLAKE2B 3100406bc65c2292c5b444760bb73bff4804181405d1a174397191ea31f41e8ecebe050bb2bee060a5be344ea5e514c0acde028f8fc483879dbff8b504a69454 SHA512 aab616bb0662c7983c0edd25fb12d79687c9c5f9b6552ac758156b756e8d4db764c50dd6534c92f02be0ba7ff45904586976d0918626b3ebb0d791d38445ec70 EBUILD rocBLAS-4.3.0.ebuild 4226 BLAKE2B 0e4814b92bf97e230dee8ff54565ca718d2482d12e3f31d194e6321a55b064f3653059dfef623d665ac5d25fadad20a8bca81ace83980c3ee8f5e62cb5c4cd24 SHA512 06528ef0cf5767ed0b9bc58794cddebfc7e247091ff78c4e0e8eeb8f75ed3cdfd5443044671837f9573cf0e576d8006ef6a7c1a96786f5d4a8f06657c5b6308c -EBUILD rocBLAS-5.0.2.ebuild 3732 BLAKE2B 75d6f4aad5aef0d4db271782f6b80a95c9a99404370e92a681e676810d00f904446fa161b0d101dd9823346b00307e1c50fb43d8d1c17f0a9a6a373fefd0fe0d SHA512 87210ab8f9eb45bcdacf4be4864e2b4dc3f55327f97190a08355250f1e21ffa23303f462d2428ce473b2a646c9595566f14bf3c0474b90b975ffdce9bcb2eecd +EBUILD rocBLAS-5.0.2-r1.ebuild 3850 BLAKE2B 22a97a83a809a2e927296c75f93b194e4b1cfd15330b70d200434f5464a7ecace665b1c172f480356c34cb856e3f55ff69fe754903bec60543d0600c5d700413 SHA512 6b2fe80de74ad6ac021cd006ecc4ede7a4bfe40f2ce1e3486607de20281efa785c519c855d45abfd131ab8ca3b69538e4a2a4e46c1d7ea4d0a0bf30552d12385 MISC metadata.xml 654 BLAKE2B b8a1d40e2ccc2aadccb9a1200e9c78fccb37544fa01c353645372a4ed01a6d153c04ff5d0d96cd7661e80b09eb6c69e8cbc59e466fef117ea1ad5ef54b1334ae SHA512 b880f8f495aee8c337b7cac4054a30f877a1204d0cda03fa90aaa25e4ae163d435c113141f2afef62967f603dea372419b228655e1b26fff53c010c8efdcebf1 diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch new file mode 100644 index 000000000000..649a98106646 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch @@ -0,0 +1,73 @@ +Only retain CMakeLists patch. We don't need install.sh, rmake.py +Suggested-By: Alessandro Barbieri <lssndrbarbieri@gmail.com> +================================================================ +From 0ffee0626bf987bae6b81183a5c61569a489537a Mon Sep 17 00:00:00 2001 +From: Torre Zuk <42548444+TorreZuk@users.noreply.github.com> +Date: Thu, 4 Nov 2021 09:21:37 -0600 +Subject: [PATCH] Swdev 309014 add jobs arg (#953) + +* adds -j --jobs argment passing of cpu_threads for build +--- + CMakeLists.txt | 1 + + install.sh | 16 ++++++++++++---- + library/src/CMakeLists.txt | 34 +++++++++++++++++++++++++--------- + rmake.py | 29 ++++++++++++++++++----------- + 4 files changed, 56 insertions(+), 24 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69cf8d586..40d88ea0a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,6 +244,7 @@ if(NOT SKIP_LIBRARY) + set( Tensile_CODE_OBJECT_VERSION "V2" CACHE STRING "Tensile code_object_version") + set( Tensile_COMPILER "hipcc" CACHE STRING "Tensile compiler") + set( Tensile_LIBRARY_FORMAT "msgpack" CACHE STRING "Tensile library format") ++ set( Tensile_CPU_THREADS "" CACHE STRING "Number of threads for Tensile parallel build") + + option( Tensile_MERGE_FILES "Tensile to merge kernels and solutions files?" ON ) + option( Tensile_SHORT_FILENAMES "Tensile to use short file names? Use if compiler complains they're too long." OFF ) +diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt +index 4f5e4572d..dedfe9794 100755 +--- a/library/src/CMakeLists.txt ++++ b/library/src/CMakeLists.txt +@@ -58,15 +58,31 @@ if( BUILD_WITH_TENSILE ) + + # Add a build target for Tensile kernel library + # Runtime language is HIP by default +- TensileCreateLibraryFiles( +- "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}" +- "${PROJECT_BINARY_DIR}/Tensile" +- ARCHITECTURE ${Tensile_ARCHITECTURE} +- CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION} +- COMPILER ${Tensile_COMPILER} +- LIBRARY_FORMAT ${Tensile_LIBRARY_FORMAT} +- ${Tensile_Options} +- ) ++ # warning our Tensile_ variables may shadow variable in TensileCreateLibraryFiles ++ # thus bypassing the function argument parameter system (mainly the options list) and CPU_THREADS ++ if(Tensile_CPU_THREADS MATCHES "^[0-9]+$") ++ # only including threads argument if number ++ TensileCreateLibraryFiles( ++ "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}" ++ "${PROJECT_BINARY_DIR}/Tensile" ++ ARCHITECTURE ${Tensile_ARCHITECTURE} ++ CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION} ++ COMPILER ${Tensile_COMPILER} ++ LIBRARY_FORMAT ${Tensile_LIBRARY_FORMAT} ++ CPU_THREADS ${Tensile_CPU_THREADS} ++ ${Tensile_Options} ++ ) ++ else() ++ TensileCreateLibraryFiles( ++ "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}" ++ "${PROJECT_BINARY_DIR}/Tensile" ++ ARCHITECTURE ${Tensile_ARCHITECTURE} ++ CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION} ++ COMPILER ${Tensile_COMPILER} ++ LIBRARY_FORMAT ${Tensile_LIBRARY_FORMAT} ++ ${Tensile_Options} ++ ) ++ endif() + + # Create a unique name for TensileHost compiled for rocBLAS + set_target_properties( TensileHost PROPERTIES OUTPUT_NAME rocblas-tensile CXX_EXTENSIONS NO ) diff --git a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild index 0600f90bac37..42637150e674 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 DOCS_BUILDER="doxygen" DOCS_DIR="docs" DOCS_DEPEND="media-gfx/graphviz" -inherit cmake docs prefix +inherit cmake docs multiprocessing prefix DESCRIPTION="AMD's library for BLAS on ROCm" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" @@ -22,7 +22,7 @@ RESTRICT="!test? ( test )" BDEPEND=" dev-util/rocm-cmake:${SLOT} - dev-util/Tensile:${SLOT} + >=dev-util/Tensile-${PV}-r1:${SLOT} " DEPEND=" @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch "${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch "${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch + "${FILESDIR}"/${PN}-5.0.2-respect-makeopts.patch ) src_prepare() { @@ -85,6 +86,7 @@ src_configure() { -DBUILD_CLIENTS_SAMPLES=OFF -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + -DTensile_CPU_THREADS=$(makeopts_jobs) ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} ) diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index b12cbff2f402..76dc0b001e7a 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -5,6 +5,6 @@ DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9 EBUILD rocFFT-4.0.0-r1.ebuild 1131 BLAKE2B 71aa2f8a3318d92ac9ec0739b0e921b10b54bd8d3b1416d23a9ac3e41b23401626c382cba34b1d9e1249e42951d8b7fdba9604cda01cb9e12cb0980850f1c997 SHA512 dbbc8c2cd0c79b16c90fbb41bdd0f901e61195b373d0ebcce5df0e9cb4eebb116af142c8f10a85ce68cc1cf9aeb1f7578eee3d360d80ecf0512ae7821db15aa2 -EBUILD rocFFT-4.3.0-r1.ebuild 2798 BLAKE2B c4e243674c4eded667cce3d3e2e4a9f1a612e0e62e699e23a3afc3482e6b1b82038a9de253748220da8c0a01bde66bada55b9a5514a2cc9688e015dcd4d91915 SHA512 fb9f81f734cb7919f63640c04e399608a84dc2864dc51f415f886b684b27d68ac6b9b504961f7bf3ae9e1533cbca7e7a4182a3def9d0f85e78ba13b13a94d306 -EBUILD rocFFT-5.0.2.ebuild 3990 BLAKE2B 6d7109e8378a68de6a95d56f61baf2b8322ce512ee3d24bec92228b17b9e42e399e3f4ebff26f079025d95d5debb43450526670810c6a91fea821bf07e166928 SHA512 54f3a877fa12d3d3cf1716135447fa48b3cfcd17c54f93433d2b940b58380f1b57c7252e3c541d8d969df688ec0f965381fbe20d0a300c9d14f1b5085a46e148 +EBUILD rocFFT-4.3.0-r1.ebuild 2815 BLAKE2B 048cac2df33144519cf7b61f59887ea7ced86fc8234076bd3c4c50257d0af1bc86b57080beb88442ad830fcaafb5c169ff04c8ec99e7ade6eaf5fcde61e39b9e SHA512 caaba36af9e4c8a98029ff6fbf29282227824a4361544f5a7049ab6a40449dd1f9f4c39ea4429f151587fa99d518aed77a0c42cb6c415495892b994af44137a6 +EBUILD rocFFT-5.0.2.ebuild 4018 BLAKE2B 129baab0c8ddeec9d234fab16523bf882056cac268b370d9e74e1124e74bef8cf039627ee1019193cbfb3c8d863eb98c6c45a75442fe3b61079b290a3ecff920 SHA512 87d77953044378aeae0f3413b5428efa7e28c51a52de51ad8336abef4158add502528ece9a003d76ae16081596d2ea8f5c6bffe3978e2d449a68bbd32a4207fe MISC metadata.xml 791 BLAKE2B d61b1f8788dd0d531aebd0b3273072a1ef2cd2e13423dd3b040cb077a6f12b2790a22159c339f98ce4ee93ee674db83390066a05d93d23e6de9dd47283a59ac7 SHA512 a33e10d3fcb784a75bf2b1d3ecddd53cf80328c37a6829202c7b74001338a2a10bdb122ce7aea65c68315e3985a890889b833cd65f4d1fb14bbf6d9bd59752e8 diff --git a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild index 5ebefcf5435f..b9dcb25f7acd 100644 --- a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild @@ -22,9 +22,9 @@ DEPEND="${RDEPEND} BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost - >=sci-libs/fftw-3 + >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 -)" +" CHECKREQS_DISK_BUILD="7G" diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild index 8d0cb72d3ed8..bd101fb2e922 100644 --- a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild @@ -33,10 +33,10 @@ DEPEND="dev-util/hip:${SLOT} BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost - >=sci-libs/fftw-3 + >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 - dev-util/rocm-cmake:${SLOT} -)" + >=dev-util/rocm-cmake-${PV}-r1:${SLOT} +" CHECKREQS_DISK_BUILD="7G" diff --git a/sci-libs/shapely/Manifest b/sci-libs/shapely/Manifest deleted file mode 100644 index 63bf3f81c96a..000000000000 --- a/sci-libs/shapely/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX shapely-1.7.1-tests-support-geos-3.9.patch 2130 BLAKE2B 2785926f41a8d9486b9591616acf1f9b2dd76c2b009a7a51fefcb664733b304e7fc59b247a87fa36f4b4301132f157a16153f78dc68c2102901c4eea46c020ba SHA512 64c5ecd44ee7b6020e9605825b8af78ba0dfcaa5b0358c8f76af4104869ce027eb059331fa8c488add3ac1e360e41f46346d24e702c54858fe2f9bbef0b929a6 -DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a -EBUILD shapely-1.7.1-r1.ebuild 766 BLAKE2B c22e5964f5c5b6d7b942dad03496705adfe651400357381f07c0032c82da5ac7e6ed8c1db66f308dff3c022f26addb45623920b4d3c28a372df504b74b7b164e SHA512 d8cd42d1644137de5a1af160c067c66d2681b538db456955aebc3495ddbdf9f07d76478f142d66b61a2c5df1f2e7540d462de266e5450c2627f2722a0a834270 -MISC metadata.xml 897 BLAKE2B 1e8c9122f9b88da6698151ad71082ddf7e6a4d7f2a6710a21e6851607afb2e48425e080d6adc40d1d27d18878a894bcc6aaf845d702adc2c83db1c4b7f8be3fd SHA512 e17253f9112e5e5e327ba66f22f2dc5dc8dc763d79870583e7d4b82c76f0429bd6431ba0845f7cb349feaf4dfc5da86492d866aba47cf91926c442c0bbb6eaa5 diff --git a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch b/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch deleted file mode 100644 index 18b6c5ad9a46..000000000000 --- a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/tests/test_svg.py b/tests/test_svg.py ---- a/tests/test_svg.py (revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf) -+++ b/tests/test_svg.py (date 1615044742785) -@@ -174,7 +174,8 @@ - self.assertSVG(GeometryCollection(), '<g />') - # Valid - self.assertSVG( -- Point(7, 3).union(LineString([(4, 2), (8, 4)])), -+ GeometryCollection( -+ [Point(7, 3), LineString([(4, 2), (8, 4)])]), - '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" ' - 'stroke-width="1.0" fill="#66cc99" opacity="0.6" />' - '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" ' ---- a/tests/test_wkb.py (revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf) -+++ b/tests/test_wkb.py (date 1615044817079) -@@ -1,6 +1,11 @@ -+import binascii -+ -+import pytest -+ -+from shapely import wkt - from shapely.wkb import dumps, loads - from shapely.geometry import Point --import binascii -+from shapely.geos import geos_version - - - def bin2hex(value): -@@ -49,3 +54,20 @@ - # replace geometry srid with another - result = dumps(geom, srid=27700) - assert bin2hex(result) == "0101000020346C0000333333333333F33F3333333333330B40" -+ -+ -+requires_geos_39 = pytest.mark.xfail( -+ geos_version < (3, 9, 0), reason="GEOS >= 3.9.0 is required", strict=True) -+ -+ -+@requires_geos_39 -+def test_point_empty(): -+ g = wkt.loads("POINT EMPTY") -+ assert g.wkb_hex == "0101000000000000000000F87F000000000000F87F" -+ -+ -+@requires_geos_39 -+def test_point_z_empty(): -+ g = wkt.loads("POINT Z EMPTY") -+ assert g.wkb_hex == \ -+ "0101000080000000000000F87F000000000000F87F000000000000F87F" -diff --git a/shapely/geos.py b/shapely/geos.py ---- a/shapely/geos.py (revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf) -+++ b/shapely/geos.py (date 1615044673942) -@@ -84,7 +84,7 @@ - 'libgeos_c.so.1', - 'libgeos_c.so', - ] -- _lgeos = load_dll('geos_c', fallbacks=alt_paths) -+ _lgeos = load_dll('libgeos_c', fallbacks=alt_paths) - # Necessary for environments with only libc.musl - c_alt_paths = [ - 'libc.musl-x86_64.so.1' diff --git a/sci-libs/shapely/metadata.xml b/sci-libs/shapely/metadata.xml deleted file mode 100644 index fb27f29d1c11..000000000000 --- a/sci-libs/shapely/metadata.xml +++ /dev/null @@ -1,19 +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> - <longdescription> - Shapely is a BSD-licensed Python package for manipulation and analysis of planar geometric objects. - It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from which GEOS is ported) libraries. - Shapely is not concerned with data formats or coordinate systems, but can be readily integrated with packages that are. - </longdescription> - <upstream> - <bugs-to>https://github.com/Toblerity/Shapely/issues</bugs-to> - <doc>https://shapely.readthedocs.io</doc> - <remote-id type="github">Toblerity/Shapely</remote-id> - <remote-id type="pypi">Shapely</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild b/sci-libs/shapely/shapely-1.7.1-r1.ebuild deleted file mode 100644 index 749e53b1ac3e..000000000000 --- a/sci-libs/shapely/shapely-1.7.1-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely" -SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P^}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -DEPEND=">=sci-libs/geos-3.9" -RDEPEND="${DEPEND} - dev-python/numpy[${PYTHON_USEDEP}] -" -BDEPEND="${DEPEND} - dev-python/cython[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}/${P}-tests-support-geos-3.9.patch" -) - -distutils_enable_tests --install pytest -distutils_enable_sphinx docs dev-python/matplotlib diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest index 100da425d423..3b2570e55266 100644 --- a/sci-libs/sundials/Manifest +++ b/sci-libs/sundials/Manifest @@ -5,5 +5,5 @@ DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2b DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b EBUILD sundials-5.2.0.ebuild 2173 BLAKE2B c7765f5fbb12395c2474f352a3200225cb2ec75360fa2089bf34ee0ddb313d136b0e66ad1955936bac2bf6f6e63bca055e7077d46fb92a69771417c51b86fb9a SHA512 00d5b62fabe026e5637cd655dc53ba12e4ff8db286b451e79a993b18ef09dcbce58805424c903bfb35ebbfcd2881873f91cfb63faa353f1789bd95fba7f17a17 EBUILD sundials-5.8.0.ebuild 2759 BLAKE2B 2f2872218e337cda6e067925f4f67ce4021a284d0d4badb31737efd6fc0917808769c24b74df4086aaef08384bd36dd744358b9d797da08c40d34f5b1aa34bdc SHA512 7cdaed08db6eab4713df5477d3051d009881cb1ef38714496618f56f831ab9e3973a0b37092cc716512c5d8dc6ed73cbb7da2fb46d0373b066290c48993cd805 -EBUILD sundials-6.2.0.ebuild 2724 BLAKE2B 6fcb90fccbe4129c3a1f60f79016f0f1ec49c123628d73368c29b9d1678ef93188280a890816ae18c46601b922a3ddffa923e14021cde909197780351c12284e SHA512 c3041f39a729f7cffd7d7b4ba8529d29ce2966ca182125a89ad11d0d86be27b5aa7590aacc85dd2d1b2a1a57fe1339ff00c10ae647a5f9c8a1e0fa7f8d5c1ac4 +EBUILD sundials-6.2.0.ebuild 2723 BLAKE2B 3d0bdf7847bb61ff87b78a3fdc806d3edcf9d72422d5c27dc05c69ffbf69a609777e25d9b2931bd11b70c911de76e84dcb06843f39aed05f5c76d56474abf78f SHA512 a3e17643240fbcb9383cccf5b90122f53f19d27213d978aa0315db52e1afa20d8c0afa57a52f6315a7050f8112e0f03d558d3b60448bc661cc4054a328ed6ff8 MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1 diff --git a/sci-libs/sundials/sundials-6.2.0.ebuild b/sci-libs/sundials/sundials-6.2.0.ebuild index bc44870f0732..6c7c190fc0c7 100644 --- a/sci-libs/sundials/sundials-6.2.0.ebuild +++ b/sci-libs/sundials/sundials-6.2.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads" REQUIRED_USE=" fortran? ( static-libs ) |