From 883b91e25e9f99aed36ed5db29ca34c002a4b614 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 21 Feb 2022 22:10:56 +0000
Subject: dev-libs/cereal: fix version in headers

Closes: https://bugs.gentoo.org/833817
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-libs/cereal/cereal-1.3.1-r1.ebuild             | 46 ++++++++++++++++++++++
 dev-libs/cereal/cereal-1.3.1.ebuild                | 42 --------------------
 .../cereal/files/cereal-1.3.1-fix-version.patch    | 14 +++++++
 3 files changed, 60 insertions(+), 42 deletions(-)
 create mode 100644 dev-libs/cereal/cereal-1.3.1-r1.ebuild
 delete mode 100644 dev-libs/cereal/cereal-1.3.1.ebuild
 create mode 100644 dev-libs/cereal/files/cereal-1.3.1-fix-version.patch

(limited to 'dev-libs/cereal')

diff --git a/dev-libs/cereal/cereal-1.3.1-r1.ebuild b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..5e128446aca6
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only C++11 serialization library"
+HOMEPAGE="https://uscilab.github.io/cereal/"
+SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-fix-version.patch
+)
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: drop bundled doctest, rapidjson, rapidxml (bug #792444)
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+
+		# Avoid Boost dependency
+		-DSKIP_PERFORMANCE_COMPARISON=ON
+
+		-DSKIP_PORTABILITY_TEST=ON
+		-DWITH_WERROR=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/cereal/cereal-1.3.1.ebuild b/dev-libs/cereal/cereal-1.3.1.ebuild
deleted file mode 100644
index b8f35d34d146..000000000000
--- a/dev-libs/cereal/cereal-1.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only C++11 serialization library"
-HOMEPAGE="https://uscilab.github.io/cereal/"
-SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	if ! use doc ; then
-		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# TODO: drop bundled doctest, rapidjson, rapidxml (bug #792444)
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-
-		# Avoid Boost dependency
-		-DSKIP_PERFORMANCE_COMPARISON=ON
-
-		-DSKIP_PORTABILITY_TEST=ON
-		-DWITH_WERROR=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch b/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
new file mode 100644
index 000000000000..9a9fa109b39d
--- /dev/null
+++ b/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
@@ -0,0 +1,14 @@
+https://github.com/USCiLab/cereal/issues/748
+https://github.com/symengine/symengine/issues/1886
+https://bugs.gentoo.org/833817
+--- a/include/cereal/version.hpp
++++ b/include/cereal/version.hpp
+@@ -42,7 +42,7 @@
+ //! The minor version
+ #define CEREAL_VERSION_MINOR 3
+ //! The patch version
+-#define CEREAL_VERSION_PATCH 0
++#define CEREAL_VERSION_PATCH 1
+ 
+ //! The full version as a single number
+ #define CEREAL_VERSION (CEREAL_VERSION_MAJOR * 10000 \
-- 
cgit v1.2.3-65-gdbad