From de13f46f79478ea73c229a0dd5122a6cb83d8ab1 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 9 Jan 2023 14:31:15 +0000
Subject: 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 <sam@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/29032
Signed-off-by: Sam James <sam@gentoo.org>
---
 sci-physics/reduze/files/reduze-2.2-db.patch |  2 +-
 sci-physics/reduze/reduze-2.4-r1.ebuild      | 60 ++++++++++++++++++++++++++++
 sci-physics/reduze/reduze-2.4.ebuild         | 58 ---------------------------
 3 files changed, 61 insertions(+), 59 deletions(-)
 create mode 100644 sci-physics/reduze/reduze-2.4-r1.ebuild
 delete mode 100644 sci-physics/reduze/reduze-2.4.ebuild

diff --git a/sci-physics/reduze/files/reduze-2.2-db.patch b/sci-physics/reduze/files/reduze-2.2-db.patch
index a43de911be7a..92c7e46d3cdf 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-r1.ebuild b/sci-physics/reduze/reduze-2.4-r1.ebuild
new file mode 100644
index 000000000000..218b666b890d
--- /dev/null
+++ b/sci-physics/reduze/reduze-2.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Program for reducing Feynman integrals"
+HOMEPAGE="https://reduze.hepforge.org/"
+SRC_URI="https://reduze.hepforge.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb doc examples mpi"
+
+RDEPEND="
+	>=sci-mathematics/ginac-1.4.1
+	berkdb? ( sys-libs/db:5.3=[cxx] )
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${PN}-2.2-db.patch
+)
+
+# remove bundled yaml-cpp
+# no: it does not build. is it patched?
+# sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks
+		-DUSE_HASH_TABLE=ON
+		-DUSE_DATABASE=$(usex berkdb)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DUSE_MPI=$(usex mpi)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	cmake_build check
+	use mpi && cmake_build check_mpi
+}
+
+src_install() {
+	use doc && local HTML_DOCS+=( "${BUILD_DIR}"/doc/code/html/. )
+	cmake_src_install
+}
diff --git a/sci-physics/reduze/reduze-2.4.ebuild b/sci-physics/reduze/reduze-2.4.ebuild
deleted file mode 100644
index c7ea66e3ee54..000000000000
--- a/sci-physics/reduze/reduze-2.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Program for reducing Feynman integrals"
-HOMEPAGE="https://reduze.hepforge.org/"
-SRC_URI="https://reduze.hepforge.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb doc examples mpi"
-
-RDEPEND="
-	>=sci-mathematics/ginac-1.4.1
-	berkdb? ( sys-libs/db:6.0[cxx] )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${PN}-2.2-db.patch
-)
-
-# remove bundled yaml-cpp
-# no: it does not build. is it patched?
-# sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks
-		-DUSE_HASH_TABLE=ON
-		-DUSE_DATABASE=$(usex berkdb)
-		-DENABLE_EXAMPLES=$(usex examples)
-		-DUSE_MPI=$(usex mpi)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all $(usev doc)
-}
-
-src_test() {
-	cmake_build check
-	use mpi && cmake_build check_mpi
-}
-
-src_install() {
-	use doc && local HTML_DOCS+=( "${BUILD_DIR}"/doc/code/html/. )
-	cmake_src_install
-}
-- 
cgit v1.2.3-65-gdbad