gentoo auto-resync : 07:02:2023 - 15:25:18

7 files changed, 10 insertions, 56 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8750f5ad64e9..58d54c2ae3f9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/mmtf-cpp/Manifest b/dev-libs/mmtf-cpp/Manifest
index c234d955c66e..b120cc375c78 100644
--- a/dev-libs/mmtf-cpp/Manifest
+++ b/dev-libs/mmtf-cpp/Manifest
@@ -1,5 +1,5 @@
 DIST mmtf-cpp-1.0.0.tar.gz 59363 BLAKE2B afcb03ce1f83e10348b148bd6218e5e10ab3e425b0f8105d292f9e265800ea6ca4562dc11fa4453df05d8a698576fba9dfe982aa91a8dcc1983480c0c52dbcf7 SHA512 0e502ae76e31689d440bff2fbc90fdab7ff62d5369e26f7ab2836966a30bda72625d6d5da33bc0770cf471a1549a02f7478ea16a01dd6be2809568d8daecb073
 DIST mmtf-cpp-1.1.0.tar.gz 106527 BLAKE2B 46f7b44ca6d9096b1f6c7911121d54ab50889c884156724229912bb125492682435d05d93b55b0c8c8025f293eb23f537da4f01a42fe65f4f89270e49429fce7 SHA512 91f30ac1031d71a5358fd83bf864afdac1d1ea758d775811b94a2609be286fcbb7dcfece097c6959afb4f8f9d237b7372183424d4ef211364cc69c08f2cd6e52
 EBUILD mmtf-cpp-1.0.0-r1.ebuild 476 BLAKE2B 41ab5557ca52751a77aab013709b3e9b0897e248b902b36c3f3acccfc38b1c49a2ad2f039969275208f40d7bf767c4b904adbdb401fe1cfb7fe939506e7bdae2 SHA512 a1099655707c9c1d6eb24b812bab09b379f86a7cf649510977daf33f9d8d17d31facea0ab7926b112a5f6c3236259a12bf8b2bfa2df3db3a2c66c18d1c1b2f9d
-EBUILD mmtf-cpp-1.1.0.ebuild 476 BLAKE2B 41ab5557ca52751a77aab013709b3e9b0897e248b902b36c3f3acccfc38b1c49a2ad2f039969275208f40d7bf767c4b904adbdb401fe1cfb7fe939506e7bdae2 SHA512 a1099655707c9c1d6eb24b812bab09b379f86a7cf649510977daf33f9d8d17d31facea0ab7926b112a5f6c3236259a12bf8b2bfa2df3db3a2c66c18d1c1b2f9d
+EBUILD mmtf-cpp-1.1.0-r1.ebuild 492 BLAKE2B 06039d23ef0b3b03943c5d51743e322bb91b9e6a48b5ed2f8f016349806a2313be9572bc6ee738ecff890ec7f6148b3891af0308b2cd9c3d65280f6949de4503 SHA512 56877a4b2d0b70445cc61fc9791fc9d4c760dc5534ba966b7bb960e41c76cf4afb14c4df9cb0b1ebb046c763c7b179c7c6a2c65a7becbbc6257ef339c410c1e3
 MISC metadata.xml 441 BLAKE2B b55284cf0df7ee0750b0a2058b95ee0e83b556cacf506d41f8c58c5f4ae6e283f61b288bf2b5f00d86f4636e1ea2f9c1824524db83d3ddcc77c10e0fb0452ec7 SHA512 c7d481aa61f4a5fa627e72bc2307eec74e1bbfcc70efa6b1ff6132ced2df8d9b55d5710a78bac639c09375d2314a74dd9e46e20a9058aceb2b7e3b85cf8c3f35
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0-r1.ebuild
index c31d0595eb2f..909f0a52da9a 100644
--- a/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,8 +12,6 @@ SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
 
-DEPEND="dev-libs/msgpack"
+DEPEND="|| ( dev-cpp/msgpack-cxx dev-libs/msgpack[cxx(-)] )"
 RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index c4cde1946db1..5a616055e015 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,6 +1,5 @@
-AUX msgpack-5.0.0-static_libs.patch 1427 BLAKE2B a376b3e0a925e8a9add3f549d0b14a88ae2d1522a0b434efafc8da27a54f665174cb07aaee22619456dee12273db39b6a5438d3916295d2a57037869874b22b7 SHA512 ce58deabe9b03ae683ef27740771ccc382795f657113bee861b6feeefbc2cd478da6bc913a5f26784793b1b0c355f208c34ac79000cd1e29b0a291909c9b8201
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
 DIST msgpack-c-5.0.0.tar.gz 69275 BLAKE2B 9c4ebc60387028cba04d5a8f4d97ca3cf6caa3db93fa7da1a90089d63cd58b36a7fb387b4fd5410d0c422719c1aed6d479418d3cbc011b609afb49cf89c4d0e3 SHA512 f61f19c7dcb5ef2a94cd3fb84e9b090e236caa922f590496e6455bd49a3d001021b55d0f28cea3ce3c35558bedb64f2f932c0e107fb15e6efc6855b99cbe4de6
-EBUILD msgpack-3.3.0.ebuild 1748 BLAKE2B 9c0d613055cbfd53e08501d6c4095a22fdd13de17f44ec7b5965635f8e592ea8c5e045f3475f26f37b5e7ce07b870b92ca74f30140a9777c3b3e5ff4f0e83a27 SHA512 446649ee99948fc644a3e117f3994e457790cca9fce337e1e4b7edbe8a4c885eb2d5ae15f866d70829577287f1bc0bc93b16ab92ae2a168402f5d5e48981f5c7
-EBUILD msgpack-5.0.0.ebuild 1387 BLAKE2B 94f2d4a8d344bb0541459cb503b1df85399bb977a31e1a1aa14c0e516e7bcedd11a0e6263590ad65c196ff27dfdd6dbdcaf07dfc587eb50febad903f8294c0d0 SHA512 d75c40091723c99aa051c298291404ae19b0ea8f5879590db7dce9ec0a5895199039d77a4344be88a3ec575e4a4017e752e49ff251e49f6fd8def629d8707e71
+EBUILD msgpack-3.3.0-r1.ebuild 1710 BLAKE2B 7166fe0dfdf716dfb085bedca02ca21b1511e9f76ba80a6cd4f882a42c0f19120310a5df88d166b586e4209c19fa1b984b1bdb41a65110546a4e802034cb04d9 SHA512 15bc7c78c243fc26c9e789b3961812d14c6dff840b89490adaf429bb8b7a1864a4a0abe7a69e36acbd53fcd48dcf51cd8e72c6808b4c2b40f93dbfda7eeff513
+EBUILD msgpack-5.0.0.ebuild 1269 BLAKE2B 5460c9cdaf759bca13d09e93beabae4baff2b9cf0a5f1d2aefa710afc88ea2a17832b834db4768991cc5974563ecc52526413beba2cf5a0aaa94f3c229e09825 SHA512 808f8a9d7609fbb1b829e8a6d49dcce1c5022f492cdf1a815d6bf8252084833355570d848e1f5155716cfacac4b55d4d8975d91df6bd79e6af8bad43287d9558
 MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a
diff --git a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch b/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
deleted file mode 100644
index e1ed2c2038a5..000000000000
--- a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,27 +82,6 @@
-     OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF)
- ENDIF ()
- 
--IF (DEFINED BUILD_SHARED_LIBS)
--    IF (BUILD_SHARED_LIBS)
--        IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED)
--            MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to ON by BUILD_SHARED_LIBS")
--        ENDIF ()
--        SET (MSGPACK_ENABLE_SHARED ON)
--        IF (DEFINED MSGPACK_ENABLE_STATIC AND MSGPACK_ENABLE_STATIC)
--            MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to OFF by BUILD_SHARED_LIBS")
--        ENDIF ()
--        SET (MSGPACK_ENABLE_STATIC OFF)
--    ELSE ()
--        IF (DEFINED MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_SHARED)
--            MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to OFF by BUILD_SHARED_LIBS")
--        ENDIF ()
--        SET (MSGPACK_ENABLE_SHARED OFF)
--        IF (DEFINED MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_STATIC)
--            MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to ON by BUILD_SHARED_LIBS")
--        ENDIF ()
--        SET (MSGPACK_ENABLE_STATIC ON)
--    ENDIF ()
--ELSE ()
-     IF (NOT DEFINED MSGPACK_ENABLE_SHARED)
-         SET (MSGPACK_ENABLE_SHARED ON)
-     ENDIF ()
-@@ -110,7 +89,6 @@
-         SET (MSGPACK_ENABLE_STATIC ON)
-     ENDIF ()
-     SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED})
--ENDIF ()
- 
- INCLUDE (Files.cmake)
- 
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild
index d6e70be0a836..4c9eb713672c 100644
--- a/dev-libs/msgpack/msgpack-3.3.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,12 @@ HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
 
 LICENSE="Boost-1.0"
 SLOT="0/2"
-IUSE="boost +cxx doc examples static-libs test"
+IUSE="boost +cxx doc examples test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
-RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
+RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )
+	!dev-cpp/msgpack-cxx"
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
@@ -34,7 +35,6 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DMSGPACK_BOOST="$(usex boost)"
 		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
-		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
 		-DMSGPACK_BUILD_TESTS="$(usex test)"
 		# don't build the examples
 		-DMSGPACK_BUILD_EXAMPLES=OFF
diff --git a/dev-libs/msgpack/msgpack-5.0.0.ebuild b/dev-libs/msgpack/msgpack-5.0.0.ebuild
index 14455fe7b732..cc6f586a055f 100644
--- a/dev-libs/msgpack/msgpack-5.0.0.ebuild
+++ b/dev-libs/msgpack/msgpack-5.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/c-${PV}/${MY_P}.tar.
 LICENSE="Boost-1.0"
 SLOT="0/2"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples static-libs test"
+IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
 
@@ -25,17 +25,12 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.0-static_libs.patch
-)
-
 S="${WORKDIR}"/${MY_P}
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DMSGPACK_BUILD_EXAMPLES=OFF
 		-DMSGPACK_BUILD_TESTS="$(usex test)"
-		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
 	)
 
 	cmake_src_configure