From de13f46f79478ea73c229a0dd5122a6cb83d8ab1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 9 Jan 2023 14:31:15 +0000 Subject: [PATCH] sci-physics/reduze: switch to sys-libs/db:5.3 This version has a more permissive licence and reduze was the only consumer left of 6.0. Dropping it will allow us to remove db:6.0. Sadly, reduze does not build with 4.8, which is the main bdb version. Signed-off-by: Sam James Closes: https://github.com/gentoo/gentoo/pull/29032 Signed-off-by: Sam James --- sci-physics/reduze/files/reduze-2.2-db.patch | 2 +- .../{reduze-2.4.ebuild => reduze-2.4-r1.ebuild} | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) rename sci-physics/reduze/{reduze-2.4.ebuild => reduze-2.4-r1.ebuild} (89%) diff --git a/sci-physics/reduze/files/reduze-2.2-db.patch b/sci-physics/reduze/files/reduze-2.2-db.patch index a43de911be7ae..92c7e46d3cdf7 100644 --- a/sci-physics/reduze/files/reduze-2.2-db.patch +++ b/sci-physics/reduze/files/reduze-2.2-db.patch @@ -6,7 +6,7 @@ diff -r -U2 a/reduze/CMakeLists.txt b/reduze/CMakeLists.txt find_path(DB_INCLUDE_PATH NAMES dbstl_common.h - PATHS /usr/local/include/db4 /usr/local/include - /usr/include/db4 /usr/include) -+ PATHS /usr/include/db6.0) ++ PATHS /usr/include/db5.3) # we also need db.h but just assume its in the same directory find_library(DB_LIBRARY NAMES db_stl - PATHS /usr/lib /usr/local/lib) diff --git a/sci-physics/reduze/reduze-2.4.ebuild b/sci-physics/reduze/reduze-2.4-r1.ebuild similarity index 89% rename from sci-physics/reduze/reduze-2.4.ebuild rename to sci-physics/reduze/reduze-2.4-r1.ebuild index c7ea66e3ee54f..218b666b890db 100644 --- a/sci-physics/reduze/reduze-2.4.ebuild +++ b/sci-physics/reduze/reduze-2.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -16,12 +16,14 @@ IUSE="berkdb doc examples mpi" RDEPEND=" >=sci-mathematics/ginac-1.4.1 - berkdb? ( sys-libs/db:6.0[cxx] ) - mpi? ( virtual/mpi )" + berkdb? ( sys-libs/db:5.3=[cxx] ) + mpi? ( virtual/mpi ) +" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( app-doc/doxygen ) +" PATCHES=( "${FILESDIR}"/${P}-cmake.patch