summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-09-25 16:32:52 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-09-25 16:33:13 -0700
commitf594ce23eb9b3df1cc94eb382a5b0e9abb9ffc69 (patch)
tree0388c5756cc3ad314f8c27c9a74b71a9de05b91b /net-libs/grpc
parentsys-firmware/vgabios: port to EAPI 7 (diff)
downloadgentoo-f594ce23eb9b3df1cc94eb382a5b0e9abb9ffc69.tar.gz
gentoo-f594ce23eb9b3df1cc94eb382a5b0e9abb9ffc69.tar.bz2
gentoo-f594ce23eb9b3df1cc94eb382a5b0e9abb9ffc69.zip
net-libs/grpc: drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'net-libs/grpc')
-rw-r--r--net-libs/grpc/Manifest2
-rw-r--r--net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch47
-rw-r--r--net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch44
-rw-r--r--net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch17
-rw-r--r--net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch53
-rw-r--r--net-libs/grpc/grpc-1.26.0-r1.ebuild114
-rw-r--r--net-libs/grpc/metadata.xml4
7 files changed, 0 insertions, 281 deletions
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 7eae7aec32bb..486074e6e565 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,2 @@
-DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
-DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
diff --git a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
deleted file mode 100644
index 213a39a38438..000000000000
--- a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 22 May 2019 23:04:28 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-picked lines from
-https://github.com/grpc/grpc/pull/11476
----
- Makefile | 236 ++++++++++++++++++++++++++++---------------------------
- 1 file changed, 119 insertions(+), 117 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 67495f2..e1c741c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
-
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
- HOST_CXXFLAGS += $(CXXFLAGS)
- HOST_LDFLAGS += $(LDFLAGS)
- HOST_LDLIBS += $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-
-@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
-
- else
-
--$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-- $(E) "[AR] Creating $@"
-+$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+ $(E) "[HOSTAR] Creating $@"
- $(Q) mkdir -p `dirname $@`
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+ $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
- ifeq ($(SYSTEM),Darwin)
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif
diff --git a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
deleted file mode 100644
index 974d6fcc4351..000000000000
--- a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile 2018-06-26 11:07:45.948160976 +0200
-+++ b/Makefile 2019-06-26 11:04:25.798966336 +0200
-@@ -2820,13 +2820,15 @@
-
- install-headers_c:
- $(E) "[INSTALL] Installing public C headers"
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) for h in $(PUBLIC_HEADERS_C); do \
-+ $(INSTALL) -D $$h $(prefix)/$$h ; \
-+ done
-
- install-headers_cxx:
- $(E) "[INSTALL] Installing public C++ headers"
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+ $(INSTALL) -D $$h $(prefix)/$$h ; \
-+ done
-
- install-static: install-static_c install-static_cxx
-
---- a/templates/Makefile.template 2019-06-26 12:38:36.777292299 +0200
-+++ b/templates/Makefile.template 2019-06-26 12:48:35.668550020 +0200
-@@ -1302,13 +1302,15 @@
-
- install-headers_c:
- $(E) "[INSTALL] Installing public C headers"
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) for h in $(PUBLIC_HEADERS_C); do \
-+ $(INSTALL) -D $$h $(prefix)/$$h ; \
-+ done
-
- install-headers_cxx:
- $(E) "[INSTALL] Installing public C++ headers"
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+ $(INSTALL) -D $$h $(prefix)/$$h ; \
-+ done
-
- install-static: install-static_c install-static_cxx
-
diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
deleted file mode 100644
index 28088713e5f8..000000000000
--- a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile 2018-05-28 17:59:34.631540261 +0800
-+++ b/Makefile 2018-05-28 18:01:31.266936000 +0800
-@@ -460,11 +460,11 @@
- CACHE_MK += HAS_PKG_CONFIG = true,
- endif
-
--CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
--CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
--CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
- ifeq ($(SYSTEM),MINGW32)
- EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
deleted file mode 100644
index d18063f2ef1b..000000000000
--- a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:26:04 -0700
-Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig
-
-It doesn't make sense to run ldconfig for a staged install. Remove it.
----
- Makefile | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 86bd66a5e0..f4c2a5bcb9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin)
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
-- $(Q) ldconfig || true
--endif
--endif
-
-
- install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
-@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin)
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
-- $(Q) ldconfig || true
--endif
--endif
-
-
- install-shared_csharp: shared_csharp strip-shared_csharp
-@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin)
- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
-- $(Q) ldconfig || true
--endif
--endif
-
-
- install-plugins: $(PROTOC_PLUGINS)
---
-2.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/grpc-1.26.0-r1.ebuild b/net-libs/grpc/grpc-1.26.0-r1.ebuild
deleted file mode 100644
index d9352892adf1..000000000000
--- a/net-libs/grpc/grpc-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~gyakovlev/distfiles/grpc-1.26-fix-odr-violation.patch.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-3.8.0:=
- >=net-dns/c-ares-1.15.0:=
- sys-libs/zlib:=
- perftools? ( dev-util/google-perftools:= )
- systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
- "${WORKDIR}/grpc-1.26-fix-odr-violation.patch" #705574
- "${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
- "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"
- "${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- rm -r third_party/cares || die
- sed -i 's:-Werror::g' Makefile || die
- sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
- default
-}
-
-src_compile() {
- tc-export CC CXX PKG_CONFIG
-
- local myemakeargs=(
- 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_AR="$(tc-getBUILD_AR)"
- HOST_CC="$(tc-getBUILD_CC)"
- HOST_CXX="$(tc-getBUILD_CXX)"
- HOST_LD="$(tc-getBUILD_CC)"
- HOST_LDXX="$(tc-getBUILD_CXX)"
- HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
- HAS_SYSTEMTAP="$(usex systemtap true false)"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- local myemakeargs=(
- V=1
- prefix="${ED}"/usr
- INSTALL_LIBDIR="$(get_libdir)"
- STRIP=/bin/true
- )
-
- emake "${myemakeargs[@]}" 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 CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 1.16.0; then
- ewarn "python bindings and tools moved to separate independent packages"
- ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
- fi
- done
-
-}
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 708220c8696a..08613524f7f3 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -8,10 +8,6 @@
<email>gyakovlev@gentoo.org</email>
<name>Georgy Yakovlev</name>
</maintainer>
- <use>
- <flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
- <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
- </use>
<upstream>
<remote-id type="cpe">cpe:/a:grpc:grpc</remote-id>
<remote-id type="github">grpc/grpc</remote-id>