Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
Date: Wed, 30 Sep 2020 02:57:11
Message-Id: 1601434624.82f8868fd9f42fd4573357ceeae4354d9647f0c2.sam@gentoo
1 commit: 82f8868fd9f42fd4573357ceeae4354d9647f0c2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 02:57:04 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 02:57:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f8868f
7
8 dev-libs/msgpack: cleanup old
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-libs/msgpack/Manifest | 3 -
14 dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch | 25 --------
15 dev-libs/msgpack/files/msgpack-1.0.0-static.patch | 40 ------------
16 dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch | 22 -------
17 dev-libs/msgpack/msgpack-1.1.0.ebuild | 47 --------------
18 dev-libs/msgpack/msgpack-3.1.1.ebuild | 75 -----------------------
19 dev-libs/msgpack/msgpack-3.2.1.ebuild | 75 -----------------------
20 7 files changed, 287 deletions(-)
21
22 diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
23 index 1f7dbe990d5..d4d73cd4aaa 100644
24 --- a/dev-libs/msgpack/Manifest
25 +++ b/dev-libs/msgpack/Manifest
26 @@ -1,5 +1,2 @@
27 -DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
28 -DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
29 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
30 -DIST msgpack-3.2.1.tar.gz 1234733 BLAKE2B 97fb6cab5125463f10e7ad2c55ee478b2bf3dab5628a40ce1b0bcdd96cc002f5c99e495592c91f1342e6623d32b5594536de226b0bf80e1cb5290dae9b0566dc SHA512 68d06b05a1f00a3d9d7d39313a9e11f42828606c39d9d4c07673a48c9b88028a6316f2a964881cc8e4d185616a037711f02a7d3cd6029eadbacf52145603538b
31 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
32
33 diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
34 deleted file mode 100644
35 index fc6cacd0a03..00000000000
36 --- a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
37 +++ /dev/null
38 @@ -1,25 +0,0 @@
39 ---- msgpack-1.0.0/CMakeLists.txt
40 -+++ msgpack-1.0.0/CMakeLists.txt
41 -@@ -213,10 +213,6 @@
42 - ADD_SUBDIRECTORY (test)
43 - ENDIF ()
44 -
45 --IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
46 -- SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC")
47 -- SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" )
48 --ENDIF ()
49 - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
50 - IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
51 - STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
52 ---- msgpack-1.0.0/test/CMakeLists.txt
53 -+++ msgpack-1.0.0/test/CMakeLists.txt
54 -@@ -52,9 +52,6 @@
55 - ${CMAKE_THREAD_LIBS_INIT}
56 - )
57 - ADD_TEST (${source_file_we} ${source_file_we})
58 -- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
59 -- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3")
60 -- ENDIF ()
61 - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
62 - IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
63 - STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
64
65 diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
66 deleted file mode 100644
67 index e40a9deaaec..00000000000
68 --- a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
69 +++ /dev/null
70 @@ -1,40 +0,0 @@
71 ---- msgpack-1.0.0/CMakeLists.txt
72 -+++ msgpack-1.0.0/CMakeLists.txt
73 -@@ -17,6 +17,7 @@
74 -
75 - OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
76 - OPTION (MSGPACK_32BIT "32bit compile" OFF)
77 -+OPTION (MSGPACK_STATIC "Build static library" ON)
78 -
79 - IF (MSGPACK_CXX11)
80 - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
81 -@@ -196,12 +197,15 @@
82 - ${msgpack_HEADERS}
83 - )
84 -
85 --ADD_LIBRARY (msgpack-static STATIC
86 -- ${msgpack_SOURCES}
87 -- ${msgpack_HEADERS}
88 --)
89 -+IF (MSGPACK_STATIC)
90 -+ ADD_LIBRARY (msgpack-static STATIC
91 -+ ${msgpack_SOURCES}
92 -+ ${msgpack_HEADERS}
93 -+ )
94 -+ SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
95 -+ INSTALL (TARGETS msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
96 -+ENDIF ()
97 -
98 --SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
99 - SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib")
100 - SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 4.0.0)
101 -
102 -@@ -233,7 +237,7 @@
103 - SET(CMAKE_INSTALL_LIBDIR lib)
104 - ENDIF ()
105 -
106 --INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
107 -+INSTALL (TARGETS msgpack DESTINATION ${CMAKE_INSTALL_LIBDIR})
108 - INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
109 - INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
110 -
111
112 diff --git a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
113 deleted file mode 100644
114 index 2fc9bb46e4b..00000000000
115 --- a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
116 +++ /dev/null
117 @@ -1,22 +0,0 @@
118 -Bug: https://bugs.gentoo.org/623492
119 -Backported from: https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de
120 -
121 ---- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
122 -+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
123 -@@ -46,13 +46,14 @@
124 - public:
125 - using base = std::tuple<Types...>;
126 -
127 -- using base::base;
128 -
129 -- tuple() = default;
130 - tuple(tuple const&) = default;
131 - tuple(tuple&&) = default;
132 -
133 - template<typename... OtherTypes>
134 -+ tuple(OtherTypes&&... other):base(std::forward<OtherTypes>(other)...) {}
135 -+
136 -+ template<typename... OtherTypes>
137 - tuple(tuple<OtherTypes...> const& other):base(static_cast<std::tuple<OtherTypes...> const&>(other)) {}
138 - template<typename... OtherTypes>
139 - tuple(tuple<OtherTypes...> && other):base(static_cast<std::tuple<OtherTypes...> &&>(other)) {}
140
141 diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
142 deleted file mode 100644
143 index 934638604a4..00000000000
144 --- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
145 +++ /dev/null
146 @@ -1,47 +0,0 @@
147 -# Copyright 1999-2019 Gentoo Authors
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=6
151 -
152 -inherit cmake-multilib
153 -
154 -if [[ ${PV} == 9999 ]]; then
155 - inherit git-r3
156 - EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
157 -else
158 - SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
159 - KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
160 -fi
161 -
162 -DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
163 -HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
164 -
165 -LICENSE="Apache-2.0"
166 -SLOT="0"
167 -IUSE="+cxx static-libs test"
168 -RESTRICT="!test? ( test )"
169 -
170 -DEPEND="
171 - test? (
172 - >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
173 - sys-libs/zlib[${MULTILIB_USEDEP}]
174 - )
175 -"
176 -
177 -DOCS=( README.md )
178 -
179 -PATCHES=(
180 - "${FILESDIR}"/${PN}-1.0.0-cflags.patch
181 - "${FILESDIR}"/${PN}-1.0.0-static.patch
182 - "${FILESDIR}"/${P}-gcc6.patch
183 -)
184 -
185 -src_configure() {
186 - local mycmakeargs=(
187 - -DMSGPACK_ENABLE_CXX=$(usex cxx)
188 - -DMSGPACK_STATIC=$(usex static-libs)
189 - -DMSGPACK_BUILD_TESTS=$(usex test)
190 - )
191 -
192 - cmake-multilib_src_configure
193 -}
194
195 diff --git a/dev-libs/msgpack/msgpack-3.1.1.ebuild b/dev-libs/msgpack/msgpack-3.1.1.ebuild
196 deleted file mode 100644
197 index 9f05ddf33b7..00000000000
198 --- a/dev-libs/msgpack/msgpack-3.1.1.ebuild
199 +++ /dev/null
200 @@ -1,75 +0,0 @@
201 -# Copyright 1999-2019 Gentoo Authors
202 -# Distributed under the terms of the GNU General Public License v2
203 -
204 -EAPI=7
205 -inherit cmake-multilib
206 -
207 -if [[ ${PV} == 9999 ]]; then
208 - inherit git-r3
209 - EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
210 -else
211 - SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
212 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
213 -fi
214 -
215 -DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
216 -HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
217 -
218 -LICENSE="Boost-1.0"
219 -SLOT="0/2"
220 -IUSE="boost +cxx doc examples static-libs test"
221 -RESTRICT="!test? ( test )"
222 -
223 -RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
224 -DEPEND="${RDEPEND}
225 - test? (
226 - >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
227 - sys-libs/zlib[${MULTILIB_USEDEP}]
228 - )
229 - doc? ( app-doc/doxygen[dot] )
230 -"
231 -
232 -src_configure() {
233 - local mycmakeargs=(
234 - -DMSGPACK_BOOST="$(usex boost)"
235 - -DMSGPACK_ENABLE_CXX="$(usex cxx)"
236 - -DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
237 - -DMSGPACK_BUILD_TESTS="$(usex test)"
238 - # don't build the examples
239 - -DMSGPACK_BUILD_EXAMPLES=OFF
240 - # enable C++11 by default
241 - -DMSGPACK_CXX11=ON
242 - )
243 - cmake-multilib_src_configure
244 -}
245 -
246 -multilib_src_compile() {
247 - cmake-utils_src_compile
248 -
249 - if multilib_is_native_abi && use doc; then
250 - cmake-utils_src_make doxygen
251 - fi
252 -}
253 -
254 -multilib_src_install() {
255 - if multilib_is_native_abi; then
256 - if use doc; then
257 - local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
258 -
259 - mkdir docs || die
260 - mv doc_c/html docs/c || die
261 -
262 - use cxx && mv doc_cpp/html docs/cpp || die
263 - fi
264 -
265 - if use examples; then
266 - docinto examples
267 -
268 - dodoc -r "${WORKDIR}/${P}/example/."
269 -
270 - docompress -x /usr/share/doc/${PF}/examples
271 - fi
272 - fi
273 -
274 - cmake-utils_src_install
275 -}
276
277 diff --git a/dev-libs/msgpack/msgpack-3.2.1.ebuild b/dev-libs/msgpack/msgpack-3.2.1.ebuild
278 deleted file mode 100644
279 index a1129dcdc40..00000000000
280 --- a/dev-libs/msgpack/msgpack-3.2.1.ebuild
281 +++ /dev/null
282 @@ -1,75 +0,0 @@
283 -# Copyright 1999-2020 Gentoo Authors
284 -# Distributed under the terms of the GNU General Public License v2
285 -
286 -EAPI=7
287 -inherit cmake-multilib
288 -
289 -if [[ ${PV} == 9999 ]]; then
290 - inherit git-r3
291 - EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
292 -else
293 - SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
294 - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
295 -fi
296 -
297 -DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
298 -HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
299 -
300 -LICENSE="Boost-1.0"
301 -SLOT="0/2"
302 -IUSE="boost +cxx doc examples static-libs test"
303 -RESTRICT="!test? ( test )"
304 -
305 -RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
306 -DEPEND="${RDEPEND}
307 - test? (
308 - >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
309 - sys-libs/zlib[${MULTILIB_USEDEP}]
310 - )
311 - doc? ( app-doc/doxygen[dot] )
312 -"
313 -
314 -src_configure() {
315 - local mycmakeargs=(
316 - -DMSGPACK_BOOST="$(usex boost)"
317 - -DMSGPACK_ENABLE_CXX="$(usex cxx)"
318 - -DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
319 - -DMSGPACK_BUILD_TESTS="$(usex test)"
320 - # don't build the examples
321 - -DMSGPACK_BUILD_EXAMPLES=OFF
322 - # enable C++11 by default
323 - -DMSGPACK_CXX11=ON
324 - )
325 - cmake-multilib_src_configure
326 -}
327 -
328 -multilib_src_compile() {
329 - cmake-utils_src_compile
330 -
331 - if multilib_is_native_abi && use doc; then
332 - cmake-utils_src_make doxygen
333 - fi
334 -}
335 -
336 -multilib_src_install() {
337 - if multilib_is_native_abi; then
338 - if use doc; then
339 - local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
340 -
341 - mkdir docs || die
342 - mv doc_c/html docs/c || die
343 -
344 - use cxx && mv doc_cpp/html docs/cpp || die
345 - fi
346 -
347 - if use examples; then
348 - docinto examples
349 -
350 - dodoc -r "${WORKDIR}/${P}/example/."
351 -
352 - docompress -x /usr/share/doc/${PF}/examples
353 - fi
354 - fi
355 -
356 - cmake-utils_src_install
357 -}