From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58703138335 for ; Sat, 27 Jul 2019 09:07:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36A76E0833; Sat, 27 Jul 2019 09:07:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A00FE0833 for ; Sat, 27 Jul 2019 09:07:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7947A348CB0 for ; Sat, 27 Jul 2019 09:07:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E742D734 for ; Sat, 27 Jul 2019 09:07:26 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1564218110.e73e3aca230f341ba27724c474fae3099317b82d.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/grpc/Manifest net-libs/grpc/grpc-1.12.1-r1.ebuild X-VCS-Directories: net-libs/grpc/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: e73e3aca230f341ba27724c474fae3099317b82d X-VCS-Branch: master Date: Sat, 27 Jul 2019 09:07:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d85eceaf-e64f-4ce1-86c5-d4df74070faa X-Archives-Hash: bfba986cd302770aade9b4c552910829 commit: e73e3aca230f341ba27724c474fae3099317b82d Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Jul 27 08:48:26 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jul 27 09:01:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73e3aca net-libs/grpc: drop 1.12.1-r1 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Georgy Yakovlev gentoo.org> net-libs/grpc/Manifest | 1 - net-libs/grpc/grpc-1.12.1-r1.ebuild | 162 ------------------------------------ 2 files changed, 163 deletions(-) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index e2f1cc58c4e..8a7c199b775 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,4 +1,3 @@ -DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962 DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254 DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385 diff --git a/net-libs/grpc/grpc-1.12.1-r1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild deleted file mode 100644 index 51e73dd8c9c..00000000000 --- a/net-libs/grpc/grpc-1.12.1-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 flag-o-matic toolchain-funcs - -# should match pinned git submodule version of third_party/protobuf -# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party -PROTOBUF_VERSION="3.5.2" - -DESCRIPTION="Modern open source high performance RPC framework" -HOMEPAGE="https://www.grpc.io" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples doc python systemtap tools" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - tools? ( python ) -" - -DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - >=dev-libs/protobuf-3.5:= - dev-util/google-perftools - net-dns/c-ares:= - sys-libs/zlib:= - python? ( ${PYTHON_DEPS} - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/python-enum34[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - ) - systemtap? ( dev-util/systemtap ) -" - -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch" - "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/0006-grpc-1.12.1-allow-system-openssl.patch" - "${FILESDIR}/0007-grpc-1.12.1-allow-system-zlib.patch" - "${FILESDIR}/0008-grpc-1.12.1-allow-system-cares.patch" - "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch" -) - -src_prepare() { - sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" - default - use python && distutils-r1_src_prepare -} - -python_prepare() { - if use tools; then - rm -r third_party/protobuf || die "removing empty protobuf dir failed" - ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die - pushd tools/distrib/python/grpcio_tools >/dev/null || die - # absolute symlinks will fail because out-of-source build - # ./src -> ${S}/src - ln -s ../../../../src ./ || die - # ./third_party -> ${S}/third_party - ln -s ../../../../third_party ./ || die - # ./grpc_root -> ${S} - ln -s ../../../../ ./grpc_root || die - # https://bugs.gentoo.org/661244 - echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in - popd >/dev/null || die - fi -} - -src_compile() { - tc-export CC CXX PKG_CONFIG - emake \ - V=1 \ - prefix=/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - AR="$(tc-getAR)" \ - AROPTS="rcs" \ - CFLAGS="${CFLAGS}" \ - LD="${CC}" \ - LDXX="${CXX}" \ - STRIP=true \ - HOST_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" \ - HAS_SYSTEMTAP="$(usex systemtap true false)" - - use python && distutils-r1_src_compile -} - -python_compile() { - export GRPC_PYTHON_BUILD_SYSTEM_CARES=1 - export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 - export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 - export GRPC_PYTHON_BUILD_WITH_CYTHON=1 - distutils-r1_python_compile - - if use tools; then - pushd tools/distrib/python/grpcio_tools >/dev/null || die - distutils-r1_python_compile - popd >/dev/null || die - fi -} - -python_compile_all() { - if use doc; then - esetup.py doc - mv doc/build doc/html || die - fi -} - -src_install() { - emake \ - prefix="${ED%/}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=true \ - install - - if use examples; then - docinto examples - dodoc -r examples/. - docompress -x /usr/share/doc/${PF}/examples - fi - - use doc && local DOCS=( AUTHORS README.md doc/. ) - einstalldocs - - use python && distutils-r1_src_install -} - -python_install() { - distutils-r1_python_install - - if use tools; then - pushd tools/distrib/python/grpcio_tools >/dev/null || die - distutils-r1_python_install - popd >/dev/null || die - fi -}