commit: a6c7811d79b3c02dee4950097f080da5195a1e10 Author: Mathy Vanvoorden <mathy <AT> vanvoorden <DOT> be> AuthorDate: Sat Feb 25 23:53:40 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Aug 23 17:05:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c7811d
dev-libs/msgpack: version bump to 1.4.2 and 2.2.1 An update to the latest version of 1.X and 2.X of the package. This was already being worked on in PR #2974, I processed the comments and added some extra things: * Updated copyright. * EAPI version bump. * Updated license to Boost-1.0. * Added examples USE-flag. * Added doc USE-flag. * Updated patches for cflags and static-libs. * Masked for testing. The new versions are masked for testing as the status of depending packages is currently unknown. Bugs for the package maintainers will be created. Gentoo-Bug: https://bugs.gentoo.org/601370 Closes: https://github.com/gentoo/gentoo/pull/4078 Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-libs/msgpack/Manifest | 2 + dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch | 32 ++++++++++ dev-libs/msgpack/files/msgpack-1.4.2-static.patch | 46 +++++++++++++ dev-libs/msgpack/msgpack-1.4.2.ebuild | 78 +++++++++++++++++++++++ dev-libs/msgpack/msgpack-2.1.1.ebuild | 77 ++++++++++++++++++++++ 5 files changed, 235 insertions(+) diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest index b46fc991215..70538289b3d 100644 --- a/dev-libs/msgpack/Manifest +++ b/dev-libs/msgpack/Manifest @@ -2,4 +2,6 @@ DIST msgpack-0.5.9.tar.gz 431625 SHA256 6139614b4142df3773d74e9d9a4dbb6dd0430103 DIST msgpack-1.0.0.tar.gz 478108 SHA256 494717d9837add0f686a77fc7ebffd7e39338cc7542cbb369aef4673eec1c3eb SHA512 afa9bf4e49fe619292e6bb59e11b0288381389d06b03778f77586ec61105a47c822eed4931a610495ac6965050266cd47c02a39095995abf702865a7b64abd88 WHIRLPOOL b5bde9267aa1c55925e154afa73fb9f1e24663b5be0242e989f1ec0d38799c84ce7a666374f1970bae94d8467f43d9b99557545f37115220a1f7d8284a34a90a DIST msgpack-1.0.1.tar.gz 484598 SHA256 a070d27d16133fe508fca72af434cd9e114709fffc1973de3dd3d3e6a987e250 SHA512 da20ddafe6ec4b61b1ea9cc9e79070c5ce7805974c0fd18ed46d6dc422732b93f29c6b28cf72ada3c77770d55f00f8b17655538535f46a60252083e2afe12545 WHIRLPOOL 409656d7d8ed66c115c27ff71ffa3efbbe47d8be215262b995220caa9c0ba9079731213080c1fd601717f8d13c7f109a0ff829aade09f324e00f297379856e76 DIST msgpack-1.1.0.tar.gz 493551 SHA256 a8d400e2f0cae811a150f564d95c7ad6f30a77ad4584303de06467234b73f345 SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901 WHIRLPOOL 103e3152a31c66644afc5a6673a7700b7bc0b7af09e800e0efe161de73cc46e85015469bdb9688db6826a611db298e79b052fc0e0703f8534e7455130250e111 +DIST msgpack-1.4.2.tar.gz 776384 SHA256 c0f1da8462ea44b23f89573eff04a1f329bcff6fd80eb0d4b976d7f19caf1fa2 SHA512 c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548 WHIRLPOOL 77d2d826b31957055a5ac8d084d69d167a61e611cbac91138fb24eb63faf84dd1af86e00fcc23a5ce20b4c8d9956c12d78b381409fdf97507f1b8ca11e8d0171 DIST msgpack-2.0.0.tar.gz 446063 SHA256 41de0989a3385061ab7307a1005655e780def6fc9c89af0ec942616aa787e136 SHA512 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3 WHIRLPOOL 1d2cd314c57d21cce310a420031f44c6faf330a9795f4d79d96028e97d5bfbf1941a27247ae9ce963966136a91e951052139f4df9b99aa17d3df431b5c26b185 +DIST msgpack-2.1.1.tar.gz 460168 SHA256 fce702408f0d228a1b9dcab69590d6a94d3938f694b95c9e5e6249617e98d83f SHA512 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5 WHIRLPOOL 62150e6b64e4e5b2fd01c3546618cbad746bc4c877033137c48b2fcc4bdfb4e0ad2628c5945162c151d285a9c9104cc4a4daf1ad3c49a642dcec39eb27d44003 diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch new file mode 100644 index 00000000000..bb3bc6bcbc5 --- /dev/null +++ b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 00000000000..994e9fbbc29 --- /dev/null +++ b/dev-libs/msgpack/files/msgpack-1.4.2-static.patch @@ -0,0 +1,46 @@ +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/msgpack-1.4.2.ebuild b/dev-libs/msgpack/msgpack-1.4.2.ebuild new file mode 100644 index 00000000000..186ab46e8bf --- /dev/null +++ b/dev-libs/msgpack/msgpack-1.4.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 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="http://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.1.1.ebuild b/dev-libs/msgpack/msgpack-2.1.1.ebuild new file mode 100644 index 00000000000..e0def45df75 --- /dev/null +++ b/dev-libs/msgpack/msgpack-2.1.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 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="http://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 +}
