From cddffad0d00b5a4b82dd981c0446489ee29e019c Mon Sep 17 00:00:00 2001
From: Peter Levine <plevine457@gmail.com>
Date: Tue, 7 Feb 2023 16:01:59 -0500
Subject: dev-libs/FXdiv: fix building with dev-cpp/gtest-1.13.0

Closes: https://bugs.gentoo.org/893340
Closes: https://github.com/gentoo/gentoo/pull/29471
Signed-off-by: Peter Levine <plevine457@gmail.com>
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild | 43 +++++++++++++++++++++++++++++++
 dev-libs/FXdiv/FXdiv-2020.12.09.ebuild    | 35 -------------------------
 2 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild
 delete mode 100644 dev-libs/FXdiv/FXdiv-2020.12.09.ebuild

(limited to 'dev-libs/FXdiv')

diff --git a/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild
new file mode 100644
index 000000000000..454495945d21
--- /dev/null
+++ b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=63058eff77e11aa15bf531df5dd34395ec3017c8
+DESCRIPTION="Division via fixed-point multiplication by inverse"
+HOMEPAGE="https://github.com/Maratyszcza/FXdiv/"
+SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# >=dev-cpp/gtest-1.13.0 requires C++14 standard or later
+	sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/g' \
+		CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFXDIV_BUILD_BENCHMARKS=OFF
+		-DFXDIV_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/FXdiv/FXdiv-2020.12.09.ebuild b/dev-libs/FXdiv/FXdiv-2020.12.09.ebuild
deleted file mode 100644
index b55cbcd18709..000000000000
--- a/dev-libs/FXdiv/FXdiv-2020.12.09.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-CommitId=63058eff77e11aa15bf531df5dd34395ec3017c8
-DESCRIPTION="Division via fixed-point multiplication by inverse"
-HOMEPAGE="https://github.com/Maratyszcza/FXdiv/"
-SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DFXDIV_BUILD_BENCHMARKS=OFF
-		-DFXDIV_BUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-- 
cgit v1.2.3-65-gdbad