From 9eb8ce4902d2775e8da4002b47c57407dffa3db6 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Sun, 11 Feb 2024 07:50:53 -0500
Subject: sci-libs/fflas-ffpack: fix pkg-config libdir (again)

I dropped this patch during the upgrade thinking that it was in the
release (it's merged upstream), but it isn't.

Closes: https://bugs.gentoo.org/924277
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
---
 sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild | 56 ++++++++++++++++++++++
 sci-libs/fflas-ffpack/fflas-ffpack-2.5.0.ebuild    | 55 ---------------------
 2 files changed, 56 insertions(+), 55 deletions(-)
 create mode 100644 sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
 delete mode 100644 sci-libs/fflas-ffpack/fflas-ffpack-2.5.0.ebuild

(limited to 'sci-libs/fflas-ffpack')

diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..90005f9a7fc4
--- /dev/null
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Library for dense linear algebra over word-size finite fields"
+HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="openmp"
+
+# Our autotools patch hacks in PKG_CHECK_MODULES calls.
+BDEPEND="virtual/pkgconfig"
+DEPEND="virtual/cblas
+	virtual/blas
+	virtual/lapack
+	dev-libs/gmp[cxx(+)]
+	=sci-libs/givaro-4.2*"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0-blaslapack.patch"
+	"${FILESDIR}/${PN}-2.4.3-no-test-echelon.patch"
+	"${FILESDIR}/${PN}-2.4.3-fix-pc-libdir.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	econf \
+		--enable-precompilation \
+		$(use_enable openmp)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0.ebuild
deleted file mode 100644
index dda1212a776f..000000000000
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Library for dense linear algebra over word-size finite fields"
-HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
-SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="openmp"
-
-# Our autotools patch hacks in PKG_CHECK_MODULES calls.
-BDEPEND="virtual/pkgconfig"
-DEPEND="virtual/cblas
-	virtual/blas
-	virtual/lapack
-	dev-libs/gmp[cxx(+)]
-	=sci-libs/givaro-4.2*"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0-blaslapack.patch"
-	"${FILESDIR}/${PN}-2.4.3-no-test-echelon.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	econf \
-		--enable-precompilation \
-		$(use_enable openmp)
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-- 
cgit v1.2.3-65-gdbad