[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     183363ba5dd9a49179efac0b8886fa7c3d56b171
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 08:51:01 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 09:01:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183363ba

net-libs/grpc: drop 1.15.0

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest           |   2 -
 net-libs/grpc/grpc-1.15.0.ebuild | 173 ---------------------------------------
 net-libs/grpc/metadata.xml       |   1 -
 3 files changed, 176 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index fab6aa9ada9..f80ec4ac5af 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,3 @@
-DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
 DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
 DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
 DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
@@ -6,4 +5,3 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
 DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST grpc-1.22.0.tar.gz 15082718 BLAKE2B 679be0488fc02441d5ba555c9150532e6ceb00bbaee9fe8b22881bef8ab713f45f96283f123576738285cfe8d358eb458cac9252bac7766cfd8ee5ac6e97fda9 SHA512 e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336
-DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839

diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
deleted file mode 100644
index 54b506a2c3a..00000000000
--- a/net-libs/grpc/grpc-1.15.0.ebuild
+++ /dev/null
@@ -1,173 +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
-# also should >=depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.6.1"
-
-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 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/cython[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${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}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.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
-		# prevent above symlinks creating huge SOURCES.TXT files, bug #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}" \
-		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="${ED%/}"/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
-
-	# only define DOCS array if requested, otherwise portage default is fine
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.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
-}

diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 3a3bfdc3d72..ccbc56aeed7 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -14,7 +14,6 @@
 	<use>
 		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
-		<flag name="tools">Install gRPC python tools</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">grpc/grpc</remote-id>