commit: 8650f7896c1decc5e71bd4e8813809bc09e4df73 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 20 20:54:53 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 20 22:07:09 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8650f789
sci-libs/flann: drop 1.9.2_p20221027 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/flann/Manifest | 1 - .../flann/files/flann-1.9.2-boost-config.patch | 23 ---- sci-libs/flann/flann-1.9.2_p20221027.ebuild | 134 --------------------- 3 files changed, 158 deletions(-) diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index de15dde604d0..7f8a6159e031 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,3 +1,2 @@ DIST flann-1.9.2_p20221027-patches-r1.tar.xz 11420 BLAKE2B 9f3e49fbc2afcfc5caadd2894ba085bcb8701233264bef0e435f6d35360e68057b7f9b738367ca701d6395a6ed16301e7c8d51feba41a5f2aafe346c4e095d55 SHA512 723ac97e0b3adc6c6104bd9a9400ed3750cc1a7a63f2f14f704cd05bf6edf6b62ab345ce7df6ba25430a63949394fb9f6d46f39ec4d86579501abdf890cd9d35 -DIST flann-1.9.2_p20221027-patches.tar.xz 10232 BLAKE2B 197dd8b81f4a7a43472e440de58a6eb7349e247514ac32a4de9d5c4ea9304da2ab6991f9561dd15fd005a4a55b14f40e4de05b324c55c50632fe9b8cd1f18371 SHA512 04bb6ff3d645ead761b37aa1e8873dc39cc8f910112fc64a55a941a4c0ab9d70a37caf018f1cc649debff04f0ac7cbbd0eb439a8a8d03b879bcddb73979e91c3 DIST flann-1.9.2_p20221027.tar.gz 34644592 BLAKE2B 822afa518a1efcfd552cee7c9bd9e14587a450d5ddae50c4d225453ab56d7297ca73f5b5bda153aea9ff37e736942057ae071ac41e3d26ac1aeb03a408171162 SHA512 14cd7d3249109ce66c43258f8b9d158efa3b57f654708e76751290eba25e2cb7fc8044a1d882c6b24d0cda1a8b206709acdb5338086ca1f2d60fef35f0fa85be diff --git a/sci-libs/flann/files/flann-1.9.2-boost-config.patch b/sci-libs/flann/files/flann-1.9.2-boost-config.patch deleted file mode 100644 index 2e3f8598bd79..000000000000 --- a/sci-libs/flann/files/flann-1.9.2-boost-config.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5127212278ef3675f36e962dc2f057583ab80f57 Mon Sep 17 00:00:00 2001 -From: Paul Zander <[email protected]> -Date: Mon, 16 Dec 2024 16:02:03 +0100 -Subject: [PATCH] boost config - -Signed-off-by: Paul Zander <[email protected]> - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64ead01..0e0b4dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,7 +108,7 @@ endif(USE_MPI) - - - if (USE_MPI AND HDF5_IS_PARALLEL) -- find_package(Boost COMPONENTS mpi system serialization thread REQUIRED) -+ find_package(Boost COMPONENTS mpi system serialization thread REQUIRED CONFIG) - include_directories(${Boost_INCLUDE_DIRS}) - add_definitions("-DHAVE_MPI") - endif() --- -2.47.1 - diff --git a/sci-libs/flann/flann-1.9.2_p20221027.ebuild b/sci-libs/flann/flann-1.9.2_p20221027.ebuild deleted file mode 100644 index 3f2cbb4e7e69..000000000000 --- a/sci-libs/flann/flann-1.9.2_p20221027.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake cuda toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="https://github.com/flann-lib/flann"; -COMMIT="f9caaf609d8b8cb2b7104a85cf59eb92c275a25d" -SRC_URI=" - https://github.com/flann-lib/${PN}/archive/${COMMIT}.tar.gz - -> ${P}.tar.gz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz -" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~x86" -IUSE="cuda doc examples mpi octave openmp test" -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( - dev-tex/latex2html - ) - mpi? ( - app-admin/chrpath - ) -" -DEPEND=" - app-arch/lz4:= - cuda? ( - dev-util/nvidia-cuda-toolkit:= - ) - examples? ( - sci-libs/hdf5:=[mpi?] - ) - mpi? ( - dev-libs/boost:=[mpi] - sci-libs/hdf5[mpi] - ) - octave? ( - >=sci-mathematics/octave-3.6.4-r1:= - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.1-build-oct-rather-than-mex-files-for-octave.patch # bug 830424 - "${FILESDIR}"/${PN}-1.9.2-asio-boost187.patch - "${FILESDIR}"/${PN}-1.9.2-boost-config.patch - "${FILESDIR}"/${PN}-1.9.2-system-gtest.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - - cmake_src_prepare - for patch in "${WORKDIR}/${P}-patches"/*; do - eapply "${patch}" - done -} - -src_configure() { - - # python bindings are split off into dev-python/pyflann - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=17 - -DBUILD_C_BINDINGS="yes" - -DBUILD_PYTHON_BINDINGS="no" - -DBUILD_CUDA_LIB="$(usex cuda)" - -DBUILD_EXAMPLES="$(usex examples)" - -DBUILD_DOC="$(usex doc)" - -DBUILD_TESTS="$(usex test)" - -DBUILD_MATLAB_BINDINGS="$(usex octave)" - -DUSE_MPI="$(usex test "$(usex mpi)")" - -DUSE_OPENMP="$(usex openmp)" - -DCMAKE_BUILD_STATIC_LIBS="no" - ) - - if use cuda; then - cuda_add_sandbox -w - - mycmakeargs+=( - -DCMAKE_CUDA_FLAGS="-Xcudafe \"--diag_suppress=partial_override\"" - ) - export CUDAHOSTCXX="$(cuda_gccdir)" - export CUDAHOSTLD="$(tc-getCXX)" - fi - - use doc && mycmakeargs+=( -DDOCDIR="share/doc/${PF}" ) - - cmake_src_configure -} - -src_compile() { - local targets=( "all" ) - - use doc && targets+=( "doc" ) - - if use test; then - targets+=( "flann_gtests" ) - if use cuda; then - targets+=( "flann_cuda_test" ) - fi - fi - - cmake_src_compile "${targets[@]}" -} - -src_test() { - # some fail when run in parallel - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - # bug 795828; mpicc voluntarily adds some runpaths - if use mpi; then - chrpath -d "${ED}/usr/bin/flann_mpi_"{client,server} || die - fi -}
