summaryrefslogtreecommitdiff
path: root/dev-libs/msgpack
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/msgpack')
-rw-r--r--dev-libs/msgpack/Manifest13
-rw-r--r--dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch32
-rw-r--r--dev-libs/msgpack/files/msgpack-1.4.2-static.patch46
-rw-r--r--dev-libs/msgpack/metadata.xml3
-rw-r--r--dev-libs/msgpack/msgpack-1.4.2.ebuild78
-rw-r--r--dev-libs/msgpack/msgpack-2.0.0.ebuild46
-rw-r--r--dev-libs/msgpack/msgpack-3.1.1.ebuild (renamed from dev-libs/msgpack/msgpack-2.1.1.ebuild)23
7 files changed, 16 insertions, 225 deletions
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 6183d1107bf8..6ac1690e5737 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,15 +1,8 @@
AUX msgpack-1.0.0-cflags.patch 1189 BLAKE2B c62a041fce3efcb0d643e8a3e3529d5be5cf7d263a731a8d7d9a839ece6e56451be4e7bd27c4f7889a31f21b3003227d8208f94811316b7e650b31b59be526bb SHA512 7e6aa85e8850b7daf0c9ee741548bab7bfe9e62871c4f5388598c28819ed8efc14cb8e828a449369ba5f97b68d4257b246a017f5815ed7d8d5cfedc4a793be51
AUX msgpack-1.0.0-static.patch 1324 BLAKE2B eb133b5bd2a344b5029dc1ed6a6ec1654e6f53531c8810e7ab83ae4f4c301e9104454a012a91fe89b52d321a932b55ae1177861a03a3fe3163cf51a9c1bfafc9 SHA512 a99cbca27fe4773711ad0220c75645d247fd1b4ed99baa41d5a952d65b316d2ea2e60182e8e1fafd6caa667ab0e6eaf110024f66337604effcdda2c9dd87d3f0
AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a34ece09bc10182e12d8970e34f06d03b94e744be5607ba9b09c5ae9873e0ead71eae87c761344bd041bbb4ecaf SHA512 be88e6f2119ded151af8334315c40027967603240158f0a1ab0aadbfdd0e8a04df13aecc9ed26135d6684a0f40f627727635c032722108bb4a63a68d8eed789b
-AUX msgpack-1.4.2-cflags.patch 1438 BLAKE2B dfd16133411240eee2035d3a791d54ebbb4a4e60e8838c4dc87e5c6dbc6331126ca3f862b2a7a830d0598e54618657701bc0ffb5fdd299ad2d4c6945451c022b SHA512 84de04af80b6237595419ff78b7cb81007e1ef2e8b2e8cd85da5a8e85b0720649ec41c48e0906c908fbb088aee2ee69efdf6b89557c9e46b5dce887afee263ed
-AUX msgpack-1.4.2-static.patch 1617 BLAKE2B a9382593ea5976b3b3c68b6be2534aeffd0651938a4139789296f377bbd17dd112ba8f454d75ddbec0602d327c41915add12734068bd1543768212da387dfd1d SHA512 1e89e47094a0b2b22c32ed0685bfca06707ce89f460d01c44868708c6e3cbf38da65e9ab9940ad469a2aec59c80690fc66a3655125c4f28ccbd6b0c8c9a57352
DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
-DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B c8605847aca3faa3aba2c573bc6f020fbfbc773e008c682978453ed353206cbb9d8ba4d521a11984f5bf7f9005b05f3ae33d6c48233f19b39f8b7f307031d36a SHA512 c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548
-DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B 273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0 SHA512 7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
-DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B 24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08 SHA512 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
-DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3 SHA512 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
+DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
EBUILD msgpack-1.1.0.ebuild 1033 BLAKE2B e41916d1f6989bc7c51034b13014b7082ec7e211ddfd2f8a04954ae4b6d401b79280cca54c7571412e28a487339f7ace68b05fc7aca15f0c8ecd8359a67e6ee6 SHA512 2184c7b7c056ea3dcce1c7502b9824066ffdcac16abed62b80edcff6af977c9694e0b3c652cd1abe08bc87f7e767e7e4cc9660370ce7f1f0d1a8e2b699b3dcb8
-EBUILD msgpack-1.4.2.ebuild 1674 BLAKE2B 2a36fc474c50ed7723ad62a2942946c62a0eddf2def09599f1e15215f24c0ba7c560f6e904a07f4cc672602a802a3659a00ce590f0f70d1463797a3f7d2cdfd1 SHA512 bc91ffe2886996f3bec6519cbd22702395efe799793567c63a43d211e5b59e2188bd9194adc607bb5fdc5ad14199a51717084aa941a400a61b1a32ba1ce5a976
-EBUILD msgpack-2.0.0.ebuild 1023 BLAKE2B fce4463e3f3b4c66ab563b2e1ea346808b0c4b4d64e1392c6e857f49db1d25dd9e3fabda8f70f4c9f07c23f29b3aa3ec042a332ccee15b1c8b647d0a765ef141 SHA512 9e920a7a0e0321cf9ef8001adec487166733a8ecb9e7aa6d4e6101b7aae9215f2389f3738724bac5acdd67dac5de26ea9b7913b8acd6c7a4cb61349da639302a
-EBUILD msgpack-2.1.1.ebuild 1673 BLAKE2B 3c50da3985f6154b8896c0913b93319aa39d181e43f252c5a89dca2b3ed1e0da6e0ce71f70dce4f62aabc0c27f402db3c0ae87ae27f6a6eb54b857e538feba0c SHA512 9f3ed1a223c3390b60c3790885ab7e19cf51f2071c9078f1f5f9de1ade7707f06a54b7f77d4f0d1169d462d70f6f341285e0604a03ce2a1a815d871dcc47c702
-MISC metadata.xml 341 BLAKE2B b8566eee509987660a6f32475b04dcc59ac3d4864a9aaf4680b8d069648a8387a7fc7e2c5119b075dab419ff3c029058cb3bd89bbf91076eebeb9d456fc4990f SHA512 2f113e9ea3a53739a77440a16e5a980082d7bfac6ac8a3185e85233999324f81ad9e9a0fceb623c4f7bc103346b345979571151dd61dcf8cc1c748db13ce67fb
+EBUILD msgpack-3.1.1.ebuild 1700 BLAKE2B 77629aa7b803c62713ec0291f6501628432ea52800aadeffea6443f0466abb372703842a2cac930a69233f241c61ad0a3f6152ea8bdd108f3f8da7f2150eb309 SHA512 5d5c958915bd61df6d8177af5f0ec5b3f708688c98c9b95381248a14efb86805efb1eb58f705439e5662aefc67d67ab248d31addd3822a7582011d1733d3d26e
+MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
deleted file mode 100644
index bb3bc6bcbc5b..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a9b241..73fe07c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -283,13 +283,6 @@ IF (MSGPACK_BUILD_TESTS)
- ADD_SUBDIRECTORY (test)
- ENDIF ()
-
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- IF (MSGPACK_ENABLE_SHARED)
-- SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
-- ENDIF ()
-- SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
--ENDIF ()
--
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
- ENDIF ()
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 5dfbbe4..5d1cb8a 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -74,9 +74,6 @@ FOREACH (source_file ${check_PROGRAMS})
- ${CMAKE_THREAD_LIBS_INIT}
- )
- ADD_TEST (${source_file_we} ${source_file_we})
-- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
-- ENDIF ()
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
- ENDIF ()
diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch b/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
deleted file mode 100644
index 994e9fbbc297..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a9b241..49b0405 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET (GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION "4.4")
- OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
- OPTION (MSGPACK_32BIT "32bit compile" OFF)
- OPTION (MSGPACK_BOOST "Using boost libraries" OFF)
-+OPTION (MSGPACK_STATIC "Build static library" ON)
-
- SET (CMAKE_CXX_FLAGS "-DMSGPACK_DISABLE_LEGACY_NIL ${CMAKE_CXX_FLAGS}")
- SET (CMAKE_CXX_FLAGS "-DMSGPACK_DISABLE_LEGACY_CONVERT ${CMAKE_CXX_FLAGS}")
-@@ -263,12 +264,14 @@ IF (MSGPACK_ENABLE_SHARED)
- )
- ENDIF ()
-
--ADD_LIBRARY (msgpackc-static STATIC
-- ${msgpackc_SOURCES}
-- ${msgpackc_HEADERS}
--)
-+IF (MSGPACK_STATIC)
-+ ADD_LIBRARY (msgpackc-static STATIC
-+ ${msgpackc_SOURCES}
-+ ${msgpackc_HEADERS}
-+ )
-+ SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
-+ENDIF()
-
--SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
- IF (MSGPACK_ENABLE_SHARED)
- SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
- SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
-@@ -322,9 +325,10 @@ IF (MSGPACK_BUILD_EXAMPLES)
- ENDIF ()
-
- IF (MSGPACK_ENABLE_SHARED)
-- SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static)
--ELSE()
-- SET (MSGPACK_INSTALLTARGETS msgpackc-static)
-+ SET (MSGPACK_INSTALLTARGETS msgpackc)
-+ENDIF()
-+IF (MSGPACK_STATIC)
-+ SET (MSGPACK_INSTALLTARGETS ${MSGPACK_INSTALLTARGETS} msgpackc-static)
- ENDIF ()
-
- INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/dev-libs/msgpack/metadata.xml b/dev-libs/msgpack/metadata.xml
index a58d5aff1a40..452594740686 100644
--- a/dev-libs/msgpack/metadata.xml
+++ b/dev-libs/msgpack/metadata.xml
@@ -5,6 +5,9 @@
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
+ <use>
+ <flag name="boost">Enable boost support</flag>
+ </use>
<upstream>
<remote-id type="github">msgpack/msgpack-c</remote-id>
</upstream>
diff --git a/dev-libs/msgpack/msgpack-1.4.2.ebuild b/dev-libs/msgpack/msgpack-1.4.2.ebuild
deleted file mode 100644
index bda3e971daca..000000000000
--- a/dev-libs/msgpack/msgpack-1.4.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
- SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="+cxx doc examples static-libs test"
-
-DEPEND="
- test? (
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
- doc? ( app-doc/doxygen[dot] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.2-cflags.patch
- "${FILESDIR}"/${PN}-1.4.2-static.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMSGPACK_ENABLE_CXX="$(usex cxx)"
- -DMSGPACK_STATIC="$(usex static-libs)"
- -DMSGPACK_BUILD_TESTS="$(usex test)"
- # Don't build the examples
- -DMSGPACK_BUILD_EXAMPLES=OFF
- # Enable C++11 by default
- -DMSGPACK_CXX11=ON
- )
- cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
-
- if multilib_is_native_abi && use doc; then
- cmake-utils_src_make doxygen
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use doc; then
- local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
- mkdir docs || die
- mv doc_c/html docs/c || die
-
- use cxx && mv doc_cpp/html docs/cpp || die
- fi
-
- if use examples; then
- docinto examples
-
- dodoc -r "${WORKDIR}/${P}/example/."
-
- docompress -x /usr/share/doc/${PF}/examples
- fi
- fi
-
- cmake-utils_src_install
-}
diff --git a/dev-libs/msgpack/msgpack-2.0.0.ebuild b/dev-libs/msgpack/msgpack-2.0.0.ebuild
deleted file mode 100644
index 8f7503aa83bb..000000000000
--- a/dev-libs/msgpack/msgpack-2.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
- SRC_URI="
- https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz
- https://dev.gentoo.org/~monsieurp/dist/${P}-patchset.tar.bz2"
-
- KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cxx static-libs test"
-
-DEPEND="
- test? (
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
-"
-
-DOCS=( README.md )
-
-PATCHES=(
- "${WORKDIR}"/patchset/${PN}-2.0.0-gcc7-implicit-fallthrough.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMSGPACK_ENABLE_CXX=$(usex cxx)
- -DMSGPACK_STATIC=$(usex static-libs)
- )
-
- cmake-multilib_src_configure
-}
diff --git a/dev-libs/msgpack/msgpack-2.1.1.ebuild b/dev-libs/msgpack/msgpack-3.1.1.ebuild
index 6f48d0e5952e..768e32012a7b 100644
--- a/dev-libs/msgpack/msgpack-2.1.1.ebuild
+++ b/dev-libs/msgpack/msgpack-3.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-multilib
if [[ ${PV} == 9999 ]]; then
@@ -16,10 +16,11 @@ DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="+cxx doc examples static-libs test"
+SLOT="0/2"
+IUSE="boost +cxx doc examples static-libs test"
-DEPEND="
+RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
test? (
>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
@@ -27,19 +28,15 @@ DEPEND="
doc? ( app-doc/doxygen[dot] )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.2-cflags.patch
- "${FILESDIR}"/${PN}-1.4.2-static.patch
-)
-
src_configure() {
local mycmakeargs=(
+ -DMSGPACK_BOOST="$(usex boost)"
-DMSGPACK_ENABLE_CXX="$(usex cxx)"
- -DMSGPACK_STATIC="$(usex static-libs)"
+ -DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
-DMSGPACK_BUILD_TESTS="$(usex test)"
- # Don't build the examples
+ # don't build the examples
-DMSGPACK_BUILD_EXAMPLES=OFF
- # Enable C++11 by default
+ # enable C++11 by default
-DMSGPACK_CXX11=ON
)
cmake-multilib_src_configure
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 22:52:48 +0000