commit: 5748b186c37cc0597d5f7efa2455d8f90d31793b Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Mon Mar 24 13:12:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 12 20:54:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5748b186
sci-mathematics/fann: update EAPI 7 -> 8, fix build with CMake 4 Also correct installation folder for pkg-config files Closes: https://bugs.gentoo.org/863050 Closes: https://bugs.gentoo.org/951922 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Signed-off-by: Sam James <sam <AT> gentoo.org> sci-mathematics/fann/fann-2.2.0-r2.ebuild | 47 +++++++++++++++++++++++ sci-mathematics/fann/files/fann-2.2.0-cmake.patch | 22 +++++++++++ 2 files changed, 69 insertions(+) diff --git a/sci-mathematics/fann/fann-2.2.0-r2.ebuild b/sci-mathematics/fann/fann-2.2.0-r2.ebuild new file mode 100644 index 000000000000..a2243c6199a3 --- /dev/null +++ b/sci-mathematics/fann/fann-2.2.0-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P=FANN-${PV}-Source +inherit cmake + +DESCRIPTION="Fast Artificial Neural Network Library" +HOMEPAGE="https://leenissen.dk"; +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.zip"; +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="examples" + +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}/${P}-examples.patch" + "${FILESDIR}/${P}-cmake.patch" +) + +src_configure() { + local mycmakeargs=( + # https://bugs.gentoo.org/863050 + -DPKGCONFIG_INSTALL_DIR="${EPREFIX}/$(get_libdir)/pkgconfig" + ) + cmake_src_configure +} + +src_test() { + cd examples || die + emake CFLAGS="${CFLAGS} -I../src/include -L${BUILD_DIR}/src" + LD_LIBRARY_PATH="${BUILD_DIR}/src" emake runtest + emake clean +} + +src_install() { + cmake_src_install + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/sci-mathematics/fann/files/fann-2.2.0-cmake.patch b/sci-mathematics/fann/files/fann-2.2.0-cmake.patch new file mode 100644 index 000000000000..e3d284b6c19f --- /dev/null +++ b/sci-mathematics/fann/files/fann-2.2.0-cmake.patch @@ -0,0 +1,22 @@ +Correct cmake_minimum_required for CMake4 +Fix paths for pkgconfig file installation +https://bugs.gentoo.org/951922 +https://bugs.gentoo.org/863050 +--- a/CMakeLists.txt 2025-03-24 15:32:02.295787034 +0300 ++++ b/CMakeLists.txt 2025-03-24 15:33:46.099775849 +0300 +@@ -1,6 +1,6 @@ ++cmake_minimum_required(VERSION 3.5) + PROJECT (FANN) + #SET(CMAKE_VERBOSE_MAKEFILE ON) +-cmake_minimum_required(VERSION 2.8) + + SET(CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/cmake/Modules +@@ -16,7 +16,6 @@ + + configure_file( ${CMAKE_SOURCE_DIR}/cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY ) + +-SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig) + + ########### install files ############### +
