commit: 12e6c1ee15c0a849709b1ce54ad4be15d9f66a08 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Dec 19 22:34:01 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Dec 19 22:34:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e6c1ee
sci-libs/lemon: Fix build w/ cmake-4 Closes: https://bugs.gentoo.org/967729 Closes: https://bugs.gentoo.org/967734 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/lemon/files/lemon-1.3.1-cmake4.patch | 21 +++++++++++++++++++++ sci-libs/lemon/lemon-1.3.1-r2.ebuild | 22 ++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/sci-libs/lemon/files/lemon-1.3.1-cmake4.patch b/sci-libs/lemon/files/lemon-1.3.1-cmake4.patch new file mode 100644 index 000000000000..1a70f1eb228a --- /dev/null +++ b/sci-libs/lemon/files/lemon-1.3.1-cmake4.patch @@ -0,0 +1,21 @@ +Source: https://salsa.debian.org/med-team/liblemon/-/raw/master/debian/patches/cmake-4.patch + +Description: bump cmake minimum required to 3.10. + Portability to cmake 4 and beyond also required dropping the CMP0048 + enforcement to the OLD behavior. +Author: Étienne Mollier <[email protected]> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1113170 +Forwarded: no +Last-Update: 2025-10-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- liblemon.orig/CMakeLists.txt ++++ liblemon/CMakeLists.txt +@@ -1,6 +1,4 @@ +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +- +-CMAKE_POLICY(SET CMP0048 OLD) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.10) + + SET(PROJECT_NAME "LEMON") + PROJECT(${PROJECT_NAME}) diff --git a/sci-libs/lemon/lemon-1.3.1-r2.ebuild b/sci-libs/lemon/lemon-1.3.1-r2.ebuild index e920a68a2326..9f63bbc23234 100644 --- a/sci-libs/lemon/lemon-1.3.1-r2.ebuild +++ b/sci-libs/lemon/lemon-1.3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,25 +15,30 @@ LICENSE="Boost-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+coin doc glpk static-libs test" -RESTRICT="!test? ( test )" REQUIRED_USE="|| ( coin glpk )" +RESTRICT="!test? ( test )" -RDEPEND="coin? ( +RDEPEND=" + coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= ) - glpk? ( sci-mathematics/glpk:= )" + glpk? ( sci-mathematics/glpk:= ) +" DEPEND="${RDEPEND}" -BDEPEND="doc? ( +BDEPEND=" + doc? ( app-text/doxygen app-text/ghostscript-gpl <dev-libs/mathjax-3 - )" + ) +" PATCHES=( "${FILESDIR}"/${P}-multilib.patch "${FILESDIR}"/${PN}-1.3-as-needed.patch + "${FILESDIR}"/${P}-cmake4.patch # bug 967729 ) src_prepare() { @@ -81,8 +86,9 @@ src_configure() { } src_test() { - cd "${S}" || die - emake -C "${BUILD_DIR}" check + pushd "${S}" > /dev/null || die + emake -C "${BUILD_DIR}" check + popd > /dev/null || die } src_install() {
