Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
Date: Fri, 28 Dec 2018 21:06:51
Message-Id: 1546030329.56a2c31206d814cdce77666e70adcfd0364c1ce0.radhermit@gentoo
1 commit: 56a2c31206d814cdce77666e70adcfd0364c1ce0
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 20:50:18 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 28 20:52:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a2c312
7
8 dev-libs/msgpack: remove old
9
10 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
11
12 dev-libs/msgpack/Manifest | 4 --
13 dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch | 32 ----------
14 dev-libs/msgpack/files/msgpack-1.4.2-static.patch | 46 -------------
15 dev-libs/msgpack/msgpack-1.4.2.ebuild | 78 -----------------------
16 dev-libs/msgpack/msgpack-2.0.0.ebuild | 46 -------------
17 dev-libs/msgpack/msgpack-2.1.1.ebuild | 77 ----------------------
18 6 files changed, 283 deletions(-)
19
20 diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
21 index 636a145ca55..2c31d5c6a9f 100644
22 --- a/dev-libs/msgpack/Manifest
23 +++ b/dev-libs/msgpack/Manifest
24 @@ -1,6 +1,2 @@
25 DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
26 -DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B c8605847aca3faa3aba2c573bc6f020fbfbc773e008c682978453ed353206cbb9d8ba4d521a11984f5bf7f9005b05f3ae33d6c48233f19b39f8b7f307031d36a SHA512 c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548
27 -DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B 273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0 SHA512 7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
28 -DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B 24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08 SHA512 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
29 -DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3 SHA512 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
30 DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
31
32 diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
33 deleted file mode 100644
34 index bb3bc6bcbc5..00000000000
35 --- a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
36 +++ /dev/null
37 @@ -1,32 +0,0 @@
38 -diff --git a/CMakeLists.txt b/CMakeLists.txt
39 -index 7a9b241..73fe07c 100644
40 ---- a/CMakeLists.txt
41 -+++ b/CMakeLists.txt
42 -@@ -283,13 +283,6 @@ IF (MSGPACK_BUILD_TESTS)
43 - ADD_SUBDIRECTORY (test)
44 - ENDIF ()
45 -
46 --IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
47 -- IF (MSGPACK_ENABLE_SHARED)
48 -- SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
49 -- ENDIF ()
50 -- SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
51 --ENDIF ()
52 --
53 - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
54 - SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
55 - ENDIF ()
56 -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
57 -index 5dfbbe4..5d1cb8a 100644
58 ---- a/test/CMakeLists.txt
59 -+++ b/test/CMakeLists.txt
60 -@@ -74,9 +74,6 @@ FOREACH (source_file ${check_PROGRAMS})
61 - ${CMAKE_THREAD_LIBS_INIT}
62 - )
63 - ADD_TEST (${source_file_we} ${source_file_we})
64 -- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
65 -- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
66 -- ENDIF ()
67 - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
68 - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
69 - ENDIF ()
70
71 diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch b/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
72 deleted file mode 100644
73 index 994e9fbbc29..00000000000
74 --- a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
75 +++ /dev/null
76 @@ -1,46 +0,0 @@
77 -diff --git a/CMakeLists.txt b/CMakeLists.txt
78 -index 7a9b241..49b0405 100644
79 ---- a/CMakeLists.txt
80 -+++ b/CMakeLists.txt
81 -@@ -20,6 +20,7 @@ SET (GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION "4.4")
82 - OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
83 - OPTION (MSGPACK_32BIT "32bit compile" OFF)
84 - OPTION (MSGPACK_BOOST "Using boost libraries" OFF)
85 -+OPTION (MSGPACK_STATIC "Build static library" ON)
86 -
87 - SET (CMAKE_CXX_FLAGS "-DMSGPACK_DISABLE_LEGACY_NIL ${CMAKE_CXX_FLAGS}")
88 - SET (CMAKE_CXX_FLAGS "-DMSGPACK_DISABLE_LEGACY_CONVERT ${CMAKE_CXX_FLAGS}")
89 -@@ -263,12 +264,14 @@ IF (MSGPACK_ENABLE_SHARED)
90 - )
91 - ENDIF ()
92 -
93 --ADD_LIBRARY (msgpackc-static STATIC
94 -- ${msgpackc_SOURCES}
95 -- ${msgpackc_HEADERS}
96 --)
97 -+IF (MSGPACK_STATIC)
98 -+ ADD_LIBRARY (msgpackc-static STATIC
99 -+ ${msgpackc_SOURCES}
100 -+ ${msgpackc_HEADERS}
101 -+ )
102 -+ SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
103 -+ENDIF()
104 -
105 --SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
106 - IF (MSGPACK_ENABLE_SHARED)
107 - SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
108 - SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
109 -@@ -322,9 +325,10 @@ IF (MSGPACK_BUILD_EXAMPLES)
110 - ENDIF ()
111 -
112 - IF (MSGPACK_ENABLE_SHARED)
113 -- SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static)
114 --ELSE()
115 -- SET (MSGPACK_INSTALLTARGETS msgpackc-static)
116 -+ SET (MSGPACK_INSTALLTARGETS msgpackc)
117 -+ENDIF()
118 -+IF (MSGPACK_STATIC)
119 -+ SET (MSGPACK_INSTALLTARGETS ${MSGPACK_INSTALLTARGETS} msgpackc-static)
120 - ENDIF ()
121 -
122 - INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} DESTINATION ${CMAKE_INSTALL_LIBDIR})
123
124 diff --git a/dev-libs/msgpack/msgpack-1.4.2.ebuild b/dev-libs/msgpack/msgpack-1.4.2.ebuild
125 deleted file mode 100644
126 index bda3e971dac..00000000000
127 --- a/dev-libs/msgpack/msgpack-1.4.2.ebuild
128 +++ /dev/null
129 @@ -1,78 +0,0 @@
130 -# Copyright 1999-2018 Gentoo Foundation
131 -# Distributed under the terms of the GNU General Public License v2
132 -
133 -EAPI=6
134 -
135 -inherit cmake-multilib
136 -
137 -if [[ ${PV} == 9999 ]]; then
138 - inherit git-r3
139 - EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
140 -else
141 - SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
142 - KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
143 -fi
144 -
145 -DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
146 -HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
147 -
148 -LICENSE="Boost-1.0"
149 -SLOT="0"
150 -IUSE="+cxx doc examples static-libs test"
151 -
152 -DEPEND="
153 - test? (
154 - >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
155 - sys-libs/zlib[${MULTILIB_USEDEP}]
156 - )
157 - doc? ( app-doc/doxygen[dot] )
158 -"
159 -
160 -PATCHES=(
161 - "${FILESDIR}"/${PN}-1.4.2-cflags.patch
162 - "${FILESDIR}"/${PN}-1.4.2-static.patch
163 -)
164 -
165 -src_configure() {
166 - local mycmakeargs=(
167 - -DMSGPACK_ENABLE_CXX="$(usex cxx)"
168 - -DMSGPACK_STATIC="$(usex static-libs)"
169 - -DMSGPACK_BUILD_TESTS="$(usex test)"
170 - # Don't build the examples
171 - -DMSGPACK_BUILD_EXAMPLES=OFF
172 - # Enable C++11 by default
173 - -DMSGPACK_CXX11=ON
174 - )
175 - cmake-multilib_src_configure
176 -}
177 -
178 -multilib_src_compile() {
179 - cmake-utils_src_compile
180 -
181 - if multilib_is_native_abi && use doc; then
182 - cmake-utils_src_make doxygen
183 - fi
184 -}
185 -
186 -multilib_src_install() {
187 - if multilib_is_native_abi; then
188 - if use doc; then
189 - local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
190 -
191 - mkdir docs || die
192 - mv doc_c/html docs/c || die
193 -
194 - use cxx && mv doc_cpp/html docs/cpp || die
195 - fi
196 -
197 - if use examples; then
198 - docinto examples
199 -
200 - dodoc -r "${WORKDIR}/${P}/example/."
201 -
202 - docompress -x /usr/share/doc/${PF}/examples
203 - fi
204 - fi
205 -
206 - cmake-utils_src_install
207 -}
208
209 diff --git a/dev-libs/msgpack/msgpack-2.0.0.ebuild b/dev-libs/msgpack/msgpack-2.0.0.ebuild
210 deleted file mode 100644
211 index 8f7503aa83b..00000000000
212 --- a/dev-libs/msgpack/msgpack-2.0.0.ebuild
213 +++ /dev/null
214 @@ -1,46 +0,0 @@
215 -# Copyright 1999-2018 Gentoo Foundation
216 -# Distributed under the terms of the GNU General Public License v2
217 -
218 -EAPI=6
219 -
220 -inherit cmake-multilib
221 -
222 -if [[ ${PV} == 9999 ]]; then
223 - inherit git-r3
224 - EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
225 -else
226 - SRC_URI="
227 - https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz
228 - https://dev.gentoo.org/~monsieurp/dist/${P}-patchset.tar.bz2"
229 -
230 - KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
231 -fi
232 -
233 -DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
234 -HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
235 -
236 -LICENSE="Apache-2.0"
237 -SLOT="0"
238 -IUSE="+cxx static-libs test"
239 -
240 -DEPEND="
241 - test? (
242 - >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
243 - sys-libs/zlib[${MULTILIB_USEDEP}]
244 - )
245 -"
246 -
247 -DOCS=( README.md )
248 -
249 -PATCHES=(
250 - "${WORKDIR}"/patchset/${PN}-2.0.0-gcc7-implicit-fallthrough.patch
251 -)
252 -
253 -src_configure() {
254 - local mycmakeargs=(
255 - -DMSGPACK_ENABLE_CXX=$(usex cxx)
256 - -DMSGPACK_STATIC=$(usex static-libs)
257 - )
258 -
259 - cmake-multilib_src_configure
260 -}
261
262 diff --git a/dev-libs/msgpack/msgpack-2.1.1.ebuild b/dev-libs/msgpack/msgpack-2.1.1.ebuild
263 deleted file mode 100644
264 index 6f48d0e5952..00000000000
265 --- a/dev-libs/msgpack/msgpack-2.1.1.ebuild
266 +++ /dev/null
267 @@ -1,77 +0,0 @@
268 -# Copyright 1999-2018 Gentoo Foundation
269 -# Distributed under the terms of the GNU General Public License v2
270 -
271 -EAPI=6
272 -inherit cmake-multilib
273 -
274 -if [[ ${PV} == 9999 ]]; then
275 - inherit git-r3
276 - EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
277 -else
278 - SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
279 - KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
280 -fi
281 -
282 -DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
283 -HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
284 -
285 -LICENSE="Boost-1.0"
286 -SLOT="0"
287 -IUSE="+cxx doc examples static-libs test"
288 -
289 -DEPEND="
290 - test? (
291 - >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
292 - sys-libs/zlib[${MULTILIB_USEDEP}]
293 - )
294 - doc? ( app-doc/doxygen[dot] )
295 -"
296 -
297 -PATCHES=(
298 - "${FILESDIR}"/${PN}-1.4.2-cflags.patch
299 - "${FILESDIR}"/${PN}-1.4.2-static.patch
300 -)
301 -
302 -src_configure() {
303 - local mycmakeargs=(
304 - -DMSGPACK_ENABLE_CXX="$(usex cxx)"
305 - -DMSGPACK_STATIC="$(usex static-libs)"
306 - -DMSGPACK_BUILD_TESTS="$(usex test)"
307 - # Don't build the examples
308 - -DMSGPACK_BUILD_EXAMPLES=OFF
309 - # Enable C++11 by default
310 - -DMSGPACK_CXX11=ON
311 - )
312 - cmake-multilib_src_configure
313 -}
314 -
315 -multilib_src_compile() {
316 - cmake-utils_src_compile
317 -
318 - if multilib_is_native_abi && use doc; then
319 - cmake-utils_src_make doxygen
320 - fi
321 -}
322 -
323 -multilib_src_install() {
324 - if multilib_is_native_abi; then
325 - if use doc; then
326 - local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
327 -
328 - mkdir docs || die
329 - mv doc_c/html docs/c || die
330 -
331 - use cxx && mv doc_cpp/html docs/cpp || die
332 - fi
333 -
334 - if use examples; then
335 - docinto examples
336 -
337 - dodoc -r "${WORKDIR}/${P}/example/."
338 -
339 - docompress -x /usr/share/doc/${PF}/examples
340 - fi
341 - fi
342 -
343 - cmake-utils_src_install
344 -}