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

["Marek Szuba" <marecki@gentoo.org>]

commit:     c23fbbc365f94c571e705bb0a55d1b8b26f68d07
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 21:39:13 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 21:59:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23fbbc3

dev-libs/msgpack-5.0.0: add *working* IUSE=static-libs

app-misc/tmate optionally relies on the availability of static
libmsgpack so until that dependency has been removed, keep this flag.
That said, having just tested it USE=static-libs is in fact a no-op
in case of =dev-libs/msgpack-3.3.0!

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../msgpack/files/msgpack-5.0.0-static_libs.patch  | 38 ++++++++++++++++++++++
 dev-libs/msgpack/msgpack-5.0.0.ebuild              |  7 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000000000000..e1ed2c2038a5
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
@@ -0,0 +1,38 @@
+--- 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-5.0.0.ebuild b/dev-libs/msgpack/msgpack-5.0.0.ebuild
index cc6f586a055f..14455fe7b732 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 test"
+IUSE="doc examples static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -25,12 +25,17 @@ 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