[gentoo-commits] repo/gentoo:master commit in: dev-libs/cereal/, dev-libs/cereal/files/

2022-03-01 Thread Sam James 
commit: 63a36c4edfdff5ef1031663d95b84f2fd4033aef
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  2 03:58:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  2 03:58:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a36c4e

dev-libs/cereal: add 1.3.2, drop 1.3.1-r1

Signed-off-by: Sam James  gentoo.org>

 dev-libs/cereal/Manifest   |  2 +-
 .../cereal/{cereal-1.3.1-r1.ebuild => cereal-1.3.2.ebuild} |  4 
 dev-libs/cereal/files/cereal-1.3.1-fix-version.patch   | 14 --
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 0ffb550d481d..78f319341970 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,3 +1,3 @@
 DIST cereal-1.3.0-fix-doctest.patch 148684 BLAKE2B 
6ab6263db5b787b3ae41b9c177df19554f17837d5bb496de887f1d2d2df28c280e038fe64f0986ce3a32cedb709249a9986f6869b6e21b7c3a4b27058739496f
 SHA512 
6389bead42f2f8008e6296f3d5ff5fc7a94920972c774003080fd3ae24ea0fd8fa1c4ab940ab800ab6b3249db003e452fd98a9ed77e5ffbdb301311fc2972a6f
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 
67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c
 SHA512 
2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
-DIST cereal-1.3.1.tar.gz 385863 BLAKE2B 
dbf2a2c60453fb9d6b13743f9a37603a9a1cd239f623ab31701da2a13136730d8994ed09d07d4f6d033d2cd1d437137806d27012d3dc4819a8ce16a2f8cfd89b
 SHA512 
5beafdd95b16344d5db43a0e26fd670a770e2c2a661ae117c9593db86697ca1034e2bf004fe6dc3c2a690e8a682f60d8b6121211d898009e59361ebef33f6fc9
+DIST cereal-1.3.2.tar.gz 385903 BLAKE2B 
a52e035f31766846dbea86ecb0071d73450bc481967221268717d46112eab1c6618d9cda627610aa1bf35308940d9408c37bd4ebb73c9ee9358334542d8ed810
 SHA512 
98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109

diff --git a/dev-libs/cereal/cereal-1.3.1-r1.ebuild 
b/dev-libs/cereal/cereal-1.3.2.ebuild
similarity index 93%
rename from dev-libs/cereal/cereal-1.3.1-r1.ebuild
rename to dev-libs/cereal/cereal-1.3.2.ebuild
index d71573e081b5..807b51bc4c74 100644
--- a/dev-libs/cereal/cereal-1.3.1-r1.ebuild
+++ b/dev-libs/cereal/cereal-1.3.2.ebuild
@@ -17,10 +17,6 @@ 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

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
deleted file mode 100644
index 9a9fa109b39d..
--- a/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 * 1 \

[gentoo-commits] repo/gentoo:master commit in: dev-libs/cereal/, dev-libs/cereal/files/

2022-02-21 Thread Sam James 
commit: 883b91e25e9f99aed36ed5db29ca34c002a4b614
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 21 22:10:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 21 22:10:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883b91e2

dev-libs/cereal: fix version in headers

Closes: https://bugs.gentoo.org/833817
Signed-off-by: Sam James  gentoo.org>

 .../cereal/{cereal-1.3.1.ebuild => cereal-1.3.1-r1.ebuild} |  4 
 dev-libs/cereal/files/cereal-1.3.1-fix-version.patch   | 14 ++
 2 files changed, 18 insertions(+)

diff --git a/dev-libs/cereal/cereal-1.3.1.ebuild 
b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
similarity index 93%
rename from dev-libs/cereal/cereal-1.3.1.ebuild
rename to dev-libs/cereal/cereal-1.3.1-r1.ebuild
index b8f35d34d146..5e128446aca6 100644
--- a/dev-libs/cereal/cereal-1.3.1.ebuild
+++ b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
@@ -17,6 +17,10 @@ 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

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 ..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 * 1 \