gentoo resync : 08.06.2019

3 files changed, 78 insertions, 0 deletions

diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index 80733bceeb9d..866315a8ffef 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -2,12 +2,15 @@ AUX 0001-Make-the-install-target-work.patch 694 BLAKE2B 21498aaf2e14e76a7df5bcd6
 AUX 0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch 1340 BLAKE2B 4f043a50d93f66beb503057179c15cce975f361936c94cba2f727c20ec6328ff83a3c028effe81d00b3426df92b3f89d49827337c2683cedb30fba718cf15696 SHA512 b916425bb94d90a4609ea55ace43c4892a3688f3f49ccecd58ab403637c40694e2f90fb7d88cd3fdbe459372293d3f2ca99789231e064a3d4a308b59169374c3
 AUX 0002-cmake-set-library-soversions.patch 5439 BLAKE2B db60577550006e0088ca991bdad3792e68281f9717238c979be875011f3b870566b604fe0e56c0f05f87e981c0118b50050186f6992d1978980047a2d015ccea SHA512 b58b2a42f9676519866a7309e2e1788138d9c77316d8a5eb9f40e6ae27a2a64c54ed5b023574cd1a47c6f87fe14f96801c9b351066a28e258153282848d64c05
 AUX google-cloud-cpp-0.5.0-openssl.patch 792 BLAKE2B 1f234335c7552d8ada5b6eec9687f8ef33fbf67220e7cff2505f3815c3d93d5c9134a291a7df0acd2f654895606082e05e37b5e21b1e0adfb891017471f8bb14 SHA512 60a411c51f719359d64de9be76a3faff3fd26d08b9d159f3b6b9dfccb49b3660a0232732b06cb1cb515f1454c2160d8dd73dd7e980af967d4cdef52cf48a3bc0
+AUX google-cloud-cpp-0.9.0-offline_nlohmannjson.patch 680 BLAKE2B bf5fdffaad3ec131f71b5053bcabe05826c395eea3cb3f02579fa841d3e18f9f72d8359c66d715206fc7521be9dd678a5370250acae0cd9fab0a367935e414cb SHA512 6af1508b86add950d3df2c051b846caf8bf8a44d042b2934417cfaf79c130378637a4ba13775045163ad44ca913837cbcd53d52398250933f062158e4b58023e
 DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e
 DIST google-cloud-cpp-0.5.0.tar.gz 1050893 BLAKE2B 6e96e2ca3f518f3c417d9d395001a42182aaeacdbbcfedc636387dbccedf5e570367bc66e5b3fecbe53d5b61e51b53709b83da90718826ac643fb2c43c1723c6 SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5
+DIST google-cloud-cpp-0.9.0.tar.gz 2209532 BLAKE2B 33b297d4836cf171833a4481b567d22f44aacdb0afd5422ec7da7f3c47fc1284a4a7723e306508c7dc7cc595166f040abe00a92eed58a07dfed77b94f99e9889 SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
 DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c0cba88c19c658ba7e9e65b80557903f8ded280d25438120b32f8c29a714b58a527c9218f0f73b53646949ecc073d873fee712b370b95523bdea5c28747eeb25 SHA512 92795397dfb9a6aa931be7b191ee91f9f2678a7175dea6babf19a50f61923373d288832cf10edf1ff252ca5148fe649c1bf95535e7c21513129495afae4c0ff7
 DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
 DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
 DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d
 EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1665 BLAKE2B 7e581ee73e76a11a0662069c48f56420e19682d0ff50da239dabd554388192a49f905f290c89fd3e53f87d5051b2a0b501b950f71b53535d0e446ed32c88d955 SHA512 86e55d3ff6702482e7f9df3bda0989d93c5d0ebe1512af465e9bdca6b160cdf0ba15cd49db480887b78e4cc31d0d3c9d24eb0a54f0d23aa7cd83b67865d1edfe
 EBUILD google-cloud-cpp-0.5.0.ebuild 1668 BLAKE2B 07e76db614ffc35f1accc059f6cfefdc7f75009618ccfe04a69fb017babc52f9177d7c6bf8c44b64f9787b16d82c3776e56f0df7978c7eec42284bda1318fc97 SHA512 da75dae85dcfbc839b95dd00bcf42f65d31bfd4d315605cbe09db9971488a5347327e3f8b71563800ea16e3ac94309b7131c3ce4ca147b026e1ad611982e78bd
+EBUILD google-cloud-cpp-0.9.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
 MISC metadata.xml 334 BLAKE2B f6f86d6b9621c1f6bb8a540835936ba0eb3ebc9ebee743cf3fdd0f236477378acff8af6528ba194cf1ba74273d3df99eeb012add242471af810afbfbe587321b SHA512 3ddab1ddecbb3f976ed02c450094873ec200d3a42faa601a10a3089d76faadaffa3fa59e48013b471e735a919502988da149f4d19e7d1d7054947462c71581a9
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
new file mode 100644
index 000000000000..b528647311eb
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/DownloadNlohmannJson.cmake b/cmake/DownloadNlohmannJson.cmake
+index 1db953bed..4bbbe35fa 100644
+--- a/cmake/DownloadNlohmannJson.cmake
++++ b/cmake/DownloadNlohmannJson.cmake
+@@ -37,6 +37,10 @@ function (_download_json_hpp)
+             execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep
+                                     "${sleep_seconds}")
+         endif ()
++        if (EXISTS "${DEST}/json.hpp")
++            set(download_error_code 0)
++            break()
++        endif ()
+         file(DOWNLOAD "${JSON_URL}" "${DEST}/json.hpp" STATUS download_status)
+         list(GET download_status 0 download_error_code)
+         if (download_error_code EQUAL 0)
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
new file mode 100644
index 000000000000..0575f7a04ab0
--- /dev/null
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+JSON_VER="3.4.0"
+GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
+
+DESCRIPTION="Google Cloud Client Library for C++"
+HOMEPAGE="https://cloud.google.com/"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
+	https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+RDEPEND="dev-libs/protobuf:=
+	dev-libs/crc32c
+	net-misc/curl
+	net-libs/grpc:="
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+DOCS=( README.md )
+PATCHES=(
+	"${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch"
+	"${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake-utils_src_configure
+
+	mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
+	cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+
+	mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
+	cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
+		"${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
+}
+
+src_test() {
+	# test fails
+	local myctestargs=(
+		-E internal_parse_rfc3339_test
+	)
+
+	cmake-utils_src_test
+}