From 056704d24f97bdc39df889f12347913f775269a0 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Fri, 31 May 2019 12:25:47 -0700 Subject: net-libs/grpc: revbump 1.2x series, bump protobuf dep to >=3.7.0 Closes: https://bugs.gentoo.org/686988 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Georgy Yakovlev --- net-libs/grpc/grpc-1.20.1-r1.ebuild | 105 +++++++++++++++++++++++++++++++++ net-libs/grpc/grpc-1.20.1.ebuild | 105 --------------------------------- net-libs/grpc/grpc-1.21.1-r1.ebuild | 112 ++++++++++++++++++++++++++++++++++++ net-libs/grpc/grpc-1.21.1.ebuild | 112 ------------------------------------ 4 files changed, 217 insertions(+), 217 deletions(-) create mode 100644 net-libs/grpc/grpc-1.20.1-r1.ebuild delete mode 100644 net-libs/grpc/grpc-1.20.1.ebuild create mode 100644 net-libs/grpc/grpc-1.21.1-r1.ebuild delete mode 100644 net-libs/grpc/grpc-1.21.1.ebuild (limited to 'net-libs/grpc') diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild new file mode 100644 index 000000000000..f34a772f7781 --- /dev/null +++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2019 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" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples doc perftools systemtap static-libs" + +RDEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist] + >=dev-libs/protobuf-3.7.0:= + >=net-dns/c-ares-1.15.0:= + sys-libs/zlib:= + perftools? ( dev-util/google-perftools:= ) + systemtap? ( dev-util/systemtap ) +" + +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +# requires network +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" +) +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + 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 + + 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)" \ + HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" +} + +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 + + 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/grpc-1.20.1.ebuild b/net-libs/grpc/grpc-1.20.1.ebuild deleted file mode 100644 index bc5eefc6e92f..000000000000 --- a/net-libs/grpc/grpc-1.20.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2019 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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples doc perftools systemtap static-libs" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - dev-libs/protobuf:= - >=net-dns/c-ares-1.15.0:= - sys-libs/zlib:= - perftools? ( dev-util/google-perftools:= ) - systemtap? ( dev-util/systemtap ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -# requires network -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" -) -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - 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 - - 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)" \ - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" -} - -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 - - 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/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild new file mode 100644 index 000000000000..f90bab18e1c5 --- /dev/null +++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2019 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" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples doc perftools systemtap static-libs" + +DEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist] + >=dev-libs/protobuf-3.7.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=( + "${FILESDIR}/1.21.0-fix-host-ar-handling.patch" + "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" +) + +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/grpc-1.21.1.ebuild b/net-libs/grpc/grpc-1.21.1.ebuild deleted file mode 100644 index 79d4eff6fd69..000000000000 --- a/net-libs/grpc/grpc-1.21.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2019 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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples doc perftools systemtap static-libs" - -DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - dev-libs/protobuf:= - >=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=( - "${FILESDIR}/1.21.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" -) - -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 - -} -- cgit v1.2.3-65-gdbad