gentoo resync : 20.03.2022

4 files changed, 62 insertions, 11 deletions

diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index f5bd82596c2f..b9ea89fb52c4 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD cereal-1.3.0-r1.ebuild 815 BLAKE2B 8ca410517b7d8f92e4d0fc8c534fbc1bf6d20790c3842b1323d11df7afa657c3c89e891efd51bf20a2af3b7278fc97493285f87490e9b8598e745cee4e351d77 SHA512 e44bb348fbded83fe7a5277570a0bc4ccc7558d11fdca65df216140fb51b548e0a814e77dfecd8b5e00dcb1df237bc06449d2b08059207fcecad5efebfd6ff04
-EBUILD cereal-1.3.0-r2.ebuild 1008 BLAKE2B 3e757e93f3c3ba8fb2836948909e7481dcc57ec5d90e88d221828a10f8b7b1120348dc62a7464c08210345c4f2d4422ff5c89219d37b6c1185d7bbdc562e69f1 SHA512 0659138d942509a716eab408f64511ae28805529ae43fdde6e452fccf3ed3d5648a4f42a6c2b395fb7e14700f3b69b0ff52dd3b04095ae19d98c227db1b1a83a
+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
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.0-r2.ebuild b/dev-libs/cereal/cereal-1.3.0-r2.ebuild
index ce67e5fd8916..585358628ca0 100644
--- a/dev-libs/cereal/cereal-1.3.0-r2.ebuild
+++ b/dev-libs/cereal/cereal-1.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/dev-libs/cereal/cereal-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..3a40d8fa882d
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.2-r1.ebuild
@@ -0,0 +1,45 @@
+# 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.0-r1.ebuild b/dev-libs/cereal/cereal-1.3.2.ebuild
index c14fc8b906f6..807b51bc4c74 100644
--- a/dev-libs/cereal/cereal-1.3.0-r1.ebuild
+++ b/dev-libs/cereal/cereal-1.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,16 +11,13 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc test"
-
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-libs/boost )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	sed -i -e '/set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")/d' CMakeLists.txt || die
-
 	if ! use doc ; then
 		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
 	fi
@@ -29,9 +26,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: drop bundled doctest, rapidjson, rapidxml (bug #792444)
+
 	local mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
+		-DBUILD_TESTS=$(usex test)
+
+		# Avoid Boost dependency
+		-DSKIP_PERFORMANCE_COMPARISON=ON
+
 		-DWITH_WERROR=OFF
 	)
+
 	cmake_src_configure
 }