1 |
commit: 40be63abc737a76dd5b43d73f36785db3da1c37a |
2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 2 18:55:36 2019 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 4 16:32:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40be63ab |
7 |
|
8 |
net-libs/google-cloud-cpp: bump 0.9.0 |
9 |
|
10 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
12 |
|
13 |
net-libs/google-cloud-cpp/Manifest | 1 + |
14 |
...ogle-cloud-cpp-0.9.0-offline_nlohmannjson.patch | 15 ++++++ |
15 |
.../google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild | 60 ++++++++++++++++++++++ |
16 |
3 files changed, 76 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest |
19 |
index 98fcedfa01c..bab75bc1ed8 100644 |
20 |
--- a/net-libs/google-cloud-cpp/Manifest |
21 |
+++ b/net-libs/google-cloud-cpp/Manifest |
22 |
@@ -1,5 +1,6 @@ |
23 |
DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e |
24 |
DIST google-cloud-cpp-0.5.0.tar.gz 1050893 BLAKE2B 6e96e2ca3f518f3c417d9d395001a42182aaeacdbbcfedc636387dbccedf5e570367bc66e5b3fecbe53d5b61e51b53709b83da90718826ac643fb2c43c1723c6 SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5 |
25 |
+DIST google-cloud-cpp-0.9.0.tar.gz 2209532 BLAKE2B 33b297d4836cf171833a4481b567d22f44aacdb0afd5422ec7da7f3c47fc1284a4a7723e306508c7dc7cc595166f040abe00a92eed58a07dfed77b94f99e9889 SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b |
26 |
DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c0cba88c19c658ba7e9e65b80557903f8ded280d25438120b32f8c29a714b58a527c9218f0f73b53646949ecc073d873fee712b370b95523bdea5c28747eeb25 SHA512 92795397dfb9a6aa931be7b191ee91f9f2678a7175dea6babf19a50f61923373d288832cf10edf1ff252ca5148fe649c1bf95535e7c21513129495afae4c0ff7 |
27 |
DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8 |
28 |
DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5 |
29 |
|
30 |
diff --git a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..b528647311e |
33 |
--- /dev/null |
34 |
+++ b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch |
35 |
@@ -0,0 +1,15 @@ |
36 |
+diff --git a/cmake/DownloadNlohmannJson.cmake b/cmake/DownloadNlohmannJson.cmake |
37 |
+index 1db953bed..4bbbe35fa 100644 |
38 |
+--- a/cmake/DownloadNlohmannJson.cmake |
39 |
++++ b/cmake/DownloadNlohmannJson.cmake |
40 |
+@@ -37,6 +37,10 @@ function (_download_json_hpp) |
41 |
+ execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep |
42 |
+ "${sleep_seconds}") |
43 |
+ endif () |
44 |
++ if (EXISTS "${DEST}/json.hpp") |
45 |
++ set(download_error_code 0) |
46 |
++ break() |
47 |
++ endif () |
48 |
+ file(DOWNLOAD "${JSON_URL}" "${DEST}/json.hpp" STATUS download_status) |
49 |
+ list(GET download_status 0 download_error_code) |
50 |
+ if (download_error_code EQUAL 0) |
51 |
|
52 |
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild |
53 |
new file mode 100644 |
54 |
index 00000000000..0575f7a04ab |
55 |
--- /dev/null |
56 |
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild |
57 |
@@ -0,0 +1,60 @@ |
58 |
+# Copyright 1999-2019 Gentoo Authors |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+ |
61 |
+EAPI=6 |
62 |
+ |
63 |
+inherit cmake-utils |
64 |
+ |
65 |
+JSON_VER="3.4.0" |
66 |
+GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97" |
67 |
+ |
68 |
+DESCRIPTION="Google Cloud Client Library for C++" |
69 |
+HOMEPAGE="https://cloud.google.com/" |
70 |
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz |
71 |
+ https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp |
72 |
+ https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" |
73 |
+ |
74 |
+LICENSE="Apache-2.0" |
75 |
+SLOT="0" |
76 |
+KEYWORDS="~amd64 ~x86" |
77 |
+IUSE="" |
78 |
+ |
79 |
+RESTRICT="test" |
80 |
+RDEPEND="dev-libs/protobuf:= |
81 |
+ dev-libs/crc32c |
82 |
+ net-misc/curl |
83 |
+ net-libs/grpc:=" |
84 |
+DEPEND="${RDEPEND} |
85 |
+ dev-cpp/gtest" |
86 |
+ |
87 |
+DOCS=( README.md ) |
88 |
+PATCHES=( |
89 |
+ "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch" |
90 |
+ "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch" |
91 |
+) |
92 |
+ |
93 |
+src_configure() { |
94 |
+ local mycmakeargs=( |
95 |
+ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package |
96 |
+ -DBUILD_SHARED_LIBS=ON |
97 |
+ -DBUILD_TESTING=OFF |
98 |
+ ) |
99 |
+ |
100 |
+ cmake-utils_src_configure |
101 |
+ |
102 |
+ mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die |
103 |
+ cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die |
104 |
+ |
105 |
+ mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die |
106 |
+ cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \ |
107 |
+ "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die |
108 |
+} |
109 |
+ |
110 |
+src_test() { |
111 |
+ # test fails |
112 |
+ local myctestargs=( |
113 |
+ -E internal_parse_rfc3339_test |
114 |
+ ) |
115 |
+ |
116 |
+ cmake-utils_src_test |
117 |
+} |