commit: e675ae12003e17698880d20cd159c7d515f54a4c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Dec 22 16:22:21 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Dec 22 16:43:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e675ae12
sci-libs/symengine: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sci-libs/symengine/Manifest | 2 - .../files/symengine-0.9.0-pthread-cmake.patch | 63 ------------- sci-libs/symengine/symengine-0.10.1.ebuild | 103 --------------------- sci-libs/symengine/symengine-0.9.0-r3.ebuild | 99 -------------------- 4 files changed, 267 deletions(-) diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest index cf6f7942c9bd..b5add05ebc62 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -1,3 +1 @@ -DIST symengine-0.10.1.tar.gz 898206 BLAKE2B 88182a7facaf0d9ac90de8acaf549a3fd3cb65f0ae12e0ba3d9a1ae477d193b312cebfca99e626815789d8746822f0d1e256db6836a1ce265f65951880f486f3 SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934 DIST symengine-0.11.1.tar.gz 898181 BLAKE2B ef14e09ceb7e9783711ca7f9f06a59362c40222e7f85de5545be834ecd79bbf41fcd34141bb3a63c106ee45067dd0b957377f937097183ffd5b93c6943976571 SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac -DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12 SHA512 dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa diff --git a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch b/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch deleted file mode 100644 index 0fa049dbf218..000000000000 --- a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6ad9620ffc578abdb920b84ea5e393c726389ac0 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Wed, 8 Jun 2022 06:02:25 +0100 -Subject: [PATCH] cmake: fix pthread detection - -The homebrew FindPTHREAD.cmake module was hardcoding the path to libpthread -in the installed CMake config file which broke consumers when upgrading from -< glibc-2.34 (e.g. glibc-2.33 -> glibc-2.34). - -CMake provides FindThreads which does the job fine for us. Tested with both -glibc-2.33 (with a previously bad generated file, and then fixed) and glibc-2.35. - -This should be fine on musl and friends too. This brings symengine in line -with most CMake packages. - -Bug: https://bugs.gentoo.org/849803 -Fixes: https://github.com/symengine/symengine/issues/1910 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -335,11 +335,10 @@ if (WITH_PIRANHA) - endif() - - if (WITH_PTHREAD) -- find_package(PTHREAD REQUIRED) -- include_directories(SYSTEM ${PTHREAD_INCLUDE_DIRS}) -- set(LIBS ${LIBS} ${PTHREAD_TARGETS}) -+ find_package(Threads) -+ set(THREADS_PREFER_PTHREAD_FLAG ON) -+ set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) - set(HAVE_SYMENGINE_PTHREAD yes) -- set(PKGS ${PKGS} "PTHREAD") - endif() - - if (WITH_MPFR) -@@ -761,10 +760,6 @@ if (WITH_BOOST) - endif() - - message("WITH_PTHREAD: ${WITH_PTHREAD}") --if (WITH_PTHREAD) -- message("PTHREAD_INCLUDE_DIRS: ${PTHREAD_INCLUDE_DIRS}") -- message("PTHREAD_LIBRARIES: ${PTHREAD_LIBRARIES}") --endif() - - message("WITH_MPC: ${WITH_MPC}") - if (WITH_MPC) ---- a/cmake/FindPTHREAD.cmake -+++ /dev/null -@@ -1,14 +0,0 @@ --include(LibFindMacros) -- --libfind_include(pthread.h pthread) --libfind_library(pthread pthread) -- --set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY}) --set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR}) --set(PTHREAD_TARGETS pthread) -- --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(PTHREAD DEFAULT_MSG PTHREAD_LIBRARIES -- PTHREAD_INCLUDE_DIRS) -- --mark_as_advanced(PTHREAD_INCLUDE_DIR PTHEARD_LIBRARY) - diff --git a/sci-libs/symengine/symengine-0.10.1.ebuild b/sci-libs/symengine/symengine-0.10.1.ebuild deleted file mode 100644 index eb06f3cc27bf..000000000000 --- a/sci-libs/symengine/symengine-0.10.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=16 -inherit cmake llvm toolchain-funcs - -DESCRIPTION="Fast symbolic manipulation library, written in C++" -HOMEPAGE="https://github.com/symengine/symengine"; -SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -# BUILD_FOR_DISTRIBUTION enables threads by default so do it here -IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/gmp:= - sys-libs/binutils-libs:= - arb? ( sci-mathematics/arb:= ) - boost? ( dev-libs/boost:= ) - ecm? ( sci-mathematics/gmp-ecm ) - flint? ( sci-mathematics/flint:= ) - mpc? ( dev-libs/mpc:= ) - mpfr? ( dev-libs/mpfr:= ) - llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) - tcmalloc? ( dev-util/google-perftools ) -" -DEPEND=" - ${RDEPEND} - dev-libs/cereal -" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch - "${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - use llvm && llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \ - -e "s|/lib|/$(get_libdir)|g" \ - -e "s|lib/|$(get_libdir)/|g" \ - -e "/DESTINATION/s|lib|$(get_libdir)|g" \ - -i CMakeLists.txt symengine/CMakeLists.txt \ - symengine/utilities/teuchos/CMakeLists.txt || die -} - -src_configure() { - # not in portage yet: piranha - local int_class - - if use arb || use flint; then - int_class=flint - elif use mpfr; then - int_class=gmpxx - elif use boost; then - int_class=boostmp - else - int_class=gmp - fi - - einfo "Building with integer class: ${int_class}" - - local mycmakeargs=( - -DINTEGER_CLASS=${int_class} - -DBUILD_BENCHMARKS=$(usex benchmarks) - -DBUILD_DOXYGEN=$(usex doc) - -DBUILD_TESTS=$(usex test) - -DWITH_ARB=$(usex arb) - -DWITH_BFD=$(usex debug) - -DWITH_SYMENGINE_ASSERT=$(usex debug) - -DWITH_SYMENGINE_THREAD_SAFE=$(usex threads) - -DWITH_FLINT=$(usex flint) - -DWITH_OPENMP=$(usex openmp) - -DWITH_MPFR=$(usex mpfr) - -DWITH_MPC=$(usex mpc) - -DWITH_LLVM=$(usex llvm) - -DWITH_PTHREAD=$(usex threads) - -DWITH_TCMALLOC=$(usex tcmalloc) - -DWITH_ECM=$(usex ecm) - -DWITH_SYSTEM_CEREAL=ON - ) - - use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${ESYSROOT}"/usr/include ) - - cmake_src_configure -} diff --git a/sci-libs/symengine/symengine-0.9.0-r3.ebuild b/sci-libs/symengine/symengine-0.9.0-r3.ebuild deleted file mode 100644 index 4613603523e6..000000000000 --- a/sci-libs/symengine/symengine-0.9.0-r3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=15 -inherit cmake llvm toolchain-funcs - -DESCRIPTION="Fast symbolic manipulation library, written in C++" -HOMEPAGE="https://github.com/symengine/symengine"; -SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -# BUILD_FOR_DISTRIBUTION enables threads by default so do it here -IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/gmp:= - sys-libs/binutils-libs:= - arb? ( sci-mathematics/arb:= ) - boost? ( dev-libs/boost:= ) - ecm? ( sci-mathematics/gmp-ecm ) - flint? ( sci-mathematics/flint:= ) - mpc? ( dev-libs/mpc:= ) - llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) - tcmalloc? ( dev-util/google-perftools )" -DEPEND="${RDEPEND} - dev-libs/cereal" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch - "${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch - "${FILESDIR}"/${PN}-0.9.0-pthread-cmake.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - use llvm && llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \ - -e "s|/lib|/$(get_libdir)|g" \ - -e "s|lib/|$(get_libdir)/|g" \ - -e "/DESTINATION/s|lib|$(get_libdir)|g" \ - -i CMakeLists.txt symengine/CMakeLists.txt \ - symengine/utilities/teuchos/CMakeLists.txt || die -} - -src_configure() { - # not in portage yet: piranha - local int_class - - if use arb || use flint; then - int_class=flint - elif use mpfr; then - int_class=gmpxx - elif use boost; then - int_class=boostmp - else - int_class=gmp - fi - - einfo "Building with integer class: ${int_class}" - - local mycmakeargs=( - -DINTEGER_CLASS=${int_class} - -DBUILD_BENCHMARKS=$(usex benchmarks) - -DBUILD_DOXYGEN=$(usex doc) - -DBUILD_TESTS=$(usex test) - -DWITH_ARB=$(usex arb) - -DWITH_BFD=$(usex debug) - -DWITH_SYMENGINE_ASSERT=$(usex debug) - -DWITH_SYMENGINE_THREAD_SAFE=$(usex threads) - -DWITH_FLINT=$(usex flint) - -DWITH_OPENMP=$(usex openmp) - -DWITH_MPFR=$(usex mpfr) - -DWITH_MPC=$(usex mpc) - -DWITH_LLVM=$(usex llvm) - -DWITH_PTHREAD=$(usex threads) - -DWITH_TCMALLOC=$(usex tcmalloc) - -DWITH_ECM=$(usex ecm) - -DWITH_SYSTEM_CEREAL=ON - ) - - use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${ESYSROOT}"/usr/include ) - - cmake_src_configure -}
