From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 6 Apr 2022 22:33:41 +0100
Subject: gentoo resync : 06.04.2022

---
 dev-libs/cereal/Manifest               |  4 +--
 dev-libs/cereal/cereal-1.3.2-r1.ebuild | 45 ------------------------------
 dev-libs/cereal/cereal-1.3.2-r2.ebuild | 51 ++++++++++++++++++++++++++++++++++
 dev-libs/cereal/cereal-1.3.2.ebuild    |  2 +-
 4 files changed, 54 insertions(+), 48 deletions(-)
 delete mode 100644 dev-libs/cereal/cereal-1.3.2-r1.ebuild
 create mode 100644 dev-libs/cereal/cereal-1.3.2-r2.ebuild

(limited to 'dev-libs/cereal')

diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index b9ea89fb52c4..961884d8e8bc 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -2,6 +2,6 @@ DIST cereal-1.3.0-fix-doctest.patch 148684 BLAKE2B 6ab6263db5b787b3ae41b9c177df1
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
 DIST cereal-1.3.2.tar.gz 385903 BLAKE2B a52e035f31766846dbea86ecb0071d73450bc481967221268717d46112eab1c6618d9cda627610aa1bf35308940d9408c37bd4ebb73c9ee9358334542d8ed810 SHA512 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109
 EBUILD cereal-1.3.0-r2.ebuild 1006 BLAKE2B 8199a733804ab6badcbbe8b84051869ecfb109a7c165f6a04d5a9b1fb788e5e8dfe36ed176cb3bea75c6fb957c5a14453b4bafecc75cb15aed7bfd6b2f7dbcd0 SHA512 d131e01315e9bd21ba9dda25e06e7775a766c50bd20ce0faf8e60dbd5065a86bc7dbc4fdb00b73c632ae15ccb27f2479ea7b4d1125af345591664ee7c8266f44
-EBUILD cereal-1.3.2-r1.ebuild 948 BLAKE2B b28353cd45de21e923ccbe596d59a4e404f8fe35cd75593019ac60929689541b894d01bea6c037f0737a5512a78799d8e15d8f064f570a50648c1643a1e88669 SHA512 8d4384b405077ce98ed9e5652870f9137dcf6677f91a3c2b055f38274867b59cd438b01c5e1006f5873eb0165034076181d56a64da386a73db61ac12f3a39aff
-EBUILD cereal-1.3.2.ebuild 817 BLAKE2B 8f868b05638d3b8aa749a3e0bf894d2c71110a4407a77e423a7fbaad95cba9157524cf01cf8a2bb6dca31b9950524419c674498fe9013d6892c8d28b4cab3d4a SHA512 3d01cb31a2241bf0356b7aec8a8e0eb06f98fb2532492f0f164a93c6dddf4c273a62a8b2dd85611fbe6e027b803d1c77618c6b9762dabc73747f239510ce72e8
+EBUILD cereal-1.3.2-r2.ebuild 1179 BLAKE2B 317830a782bf36f6cc5d0ed66d09500798a2853ed9553cb56057d7682531e3af46d16e51e0f2b08a849211ef5d4583a0e8307dcc6d708672e986b04427023428 SHA512 244c0e26bf2afb1e3023a6f254214b74b8dbd273ae4f09742779302408da25f68c3b60f1f911e8aa5b016581332f083303a0e6e18b3a23e77b6052b99abc9225
+EBUILD cereal-1.3.2.ebuild 822 BLAKE2B 4599c212ad8eb6f2d8354355fcfce5b8cb8732b4bcce8e12c5dd3afbaa4358d57cb1177d70e0bc8a0fe05a232488903cfc1269cdfe27e08648fea3bd4cf82b61 SHA512 b8420176989887f0f13f857710095050c687cc56bb532a4e9e14c9a21e2a8b700e65cb109b1fcb96603557791a6ea497734e2985b72d06be872096f563e0d568
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/dev-libs/cereal/cereal-1.3.2-r1.ebuild
deleted file mode 100644
index 3a40d8fa882d..000000000000
--- a/dev-libs/cereal/cereal-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,45 +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 ~riscv ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="dev-libs/rapidjson"
-
-src_prepare() {
-	if ! use doc ; then
-		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
-	fi
-
-	# remove bundled rapidjson
-	rm -r include/cereal/external/rapidjson || die 'could not remove bundled rapidjson'
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# TODO: drop bundled doctest, rapidxml (bug #792444)
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-
-		# Avoid Boost dependency
-		-DSKIP_PERFORMANCE_COMPARISON=ON
-
-		-DWITH_WERROR=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/cereal/cereal-1.3.2-r2.ebuild b/dev-libs/cereal/cereal-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..da3bf9c69469
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.2-r2.ebuild
@@ -0,0 +1,51 @@
+# 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 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="dev-libs/rapidjson"
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
+	fi
+
+	# remove bundled rapidjson
+	rm -r include/cereal/external/rapidjson || die 'could not remove bundled rapidjson'
+	sed -e '/rapidjson/s|cereal/external/||' \
+		-e 's/CEREAL_RAPIDJSON_NAMESPACE/rapidjson/g' \
+		-i include/cereal/archives/json.hpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: drop bundled doctest, rapidxml (bug #792444)
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+
+		# Avoid Boost dependency
+		-DSKIP_PERFORMANCE_COMPARISON=ON
+
+		-DWITH_WERROR=OFF
+	)
+
+	# TODO: Enable if multilib?
+	use test && mycmakeargs+=( -DSKIP_PORTABILITY_TEST=ON )
+
+	cmake_src_configure
+}
diff --git a/dev-libs/cereal/cereal-1.3.2.ebuild b/dev-libs/cereal/cereal-1.3.2.ebuild
index 807b51bc4c74..f342726f1ea8 100644
--- a/dev-libs/cereal/cereal-1.3.2.ebuild
+++ b/dev-libs/cereal/cereal-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-- 
cgit v1.2.3