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 431C5138334 for ; Sun, 15 Jul 2018 22:21:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44845E081A; Sun, 15 Jul 2018 22:21:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 02801E081A for ; Sun, 15 Jul 2018 22:21:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7E042335C8E for ; Sun, 15 Jul 2018 22:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 135A4374 for ; Sun, 15 Jul 2018 22:20:58 +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: <1531692814.5d7099dca23483891bc22124c0dda25dcf7706b6.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/grpc/grpc-1.12.1.ebuild net-libs/grpc/grpc-1.13.0.ebuild X-VCS-Directories: net-libs/grpc/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 5d7099dca23483891bc22124c0dda25dcf7706b6 X-VCS-Branch: master Date: Sun, 15 Jul 2018 22:20:58 +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-Archives-Salt: 60629bd7-a2a8-4ba7-a27f-6f18f7a8331e X-Archives-Hash: fcdaa63455f8900a0ed3d9d47231fc7c commit: 5d7099dca23483891bc22124c0dda25dcf7706b6 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Jul 15 22:07:37 2018 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Jul 15 22:13:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7099dc net-libs/grpc: drop old Closes: https://bugs.gentoo.org/661244 Package-Manager: Portage-2.3.42, Repoman-2.3.9 net-libs/grpc/grpc-1.12.1.ebuild | 160 ------------------------------------ net-libs/grpc/grpc-1.13.0.ebuild | 171 --------------------------------------- 2 files changed, 331 deletions(-) diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1.ebuild deleted file mode 100644 index e57c672f483..00000000000 --- a/net-libs/grpc/grpc-1.12.1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,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="http://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 - 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="${D}"/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 -} diff --git a/net-libs/grpc/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0.ebuild deleted file mode 100644 index 824ec4b1aa0..00000000000 --- a/net-libs/grpc/grpc-1.13.0.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,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 -# also should ~depend on same version of dev-libs/protobuf below -PROTOBUF_VERSION="3.5.2" - -DESCRIPTION="Modern open source high performance RPC framework" -HOMEPAGE="http://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 static-libs tools" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - tools? ( python ) -" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - >=dev-libs/protobuf-${PROTOBUF_VERSION}:= - 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}] - ) - systemtap? ( dev-util/systemtap ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - python? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - ) -" - -PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.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}/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 - # ./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 - 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}" \ - CXXFLAGS="${CXXFLAGS}" \ - LD="${CC}" \ - LDXX="${CXX}" \ - STRIP=/bin/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="${D}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=/bin/true \ - install - - use static-libs || find "${ED}" -name '*.a' -delete - - if use examples; then - find examples -name '.gitignore' -delete || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - if use doc; then - find doc -name '.gitignore' -delete || die - local DOCS=( AUTHORS README.md doc/. ) - fi - - 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 -}