commit: 5cd60c98745f183e9327110469af3ae0c24c95a0 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Dec 4 08:47:26 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Dec 4 08:47:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd60c98
net-libs/libtirpc: Removed old Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> net-libs/libtirpc/Manifest | 1 - .../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 --------------- .../libtirpc/files/libtirpc-1.2.5-endian.h.patch | 31 ----------- net-libs/libtirpc/libtirpc-1.2.5.ebuild | 65 ---------------------- 4 files changed, 141 deletions(-) diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 5715978a610..ccb8c655851 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,4 +1,3 @@ -DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a DIST libtirpc-1.3.1.tar.bz2 513399 BLAKE2B 8cc42292cdbde55a0095669bd9ccb3666b9e33d6ec9880ac79d034d42155d1b585f4181ff92f8290d7b5cce01bace2629d1ddfe0d61813f00851216f2be5ed0d SHA512 131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch deleted file mode 100644 index a5fecc54ced..00000000000 --- a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Sun, 19 Jan 2020 16:57:45 -0500 -Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common - -GCC 10 enables -fno-common by default. - -Bug: https://bugs.gentoo.org/705896 ---- - src/rpc_com.h | 3 +-- - src/svc.c | 3 +++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/rpc_com.h b/src/rpc_com.h -index 10bec79..76badef 100644 ---- a/src/rpc_com.h -+++ b/src/rpc_com.h -@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *); - void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *); - - --SVCXPRT **__svc_xports; --int __svc_maxrec; -+extern int __svc_maxrec; - - #ifdef __cplusplus - } -diff --git a/src/svc.c b/src/svc.c -index b59467b..6db164b 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -57,6 +57,9 @@ - - #define max(a, b) (a > b ? a : b) - -+static SVCXPRT **__svc_xports; -+int __svc_maxrec; -+ - /* - * The services list - * Each entry represents a set of procedures (an rpc program). --- -2.25.0 - diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch deleted file mode 100644 index 8245d022bde..00000000000 --- a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001 -From: Rosen Penev <[email protected]> -Date: Tue, 21 Jan 2020 11:51:16 -0500 -Subject: [PATCH] xdr_float: do not include bits/endian.h - -bits/endian.h is an internal header. endian.h should be included. - -Fixes compilation with recent musl. - -Signed-off-by: Rosen Penev <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> ---- - src/xdr_float.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xdr_float.c b/src/xdr_float.c -index 26bc865..349d48f 100644 ---- a/src/xdr_float.c -+++ b/src/xdr_float.c -@@ -83,7 +83,7 @@ static struct sgl_limits { - }; - #else - --#include <bits/endian.h> -+#include <endian.h> - #define IEEEFP - - #endif /* vax */ --- -1.8.3.1 - diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild deleted file mode 100644 index 632193139a1..00000000000 --- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs usr-ldscript - -DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" -HOMEPAGE="https://sourceforge.net/projects/libtirpc/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://gentoo/${PN}-glibc-nfs.tar.xz" - -LICENSE="GPL-2" -SLOT="0/3" # subslot matches SONAME major -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="ipv6 kerberos static-libs" - -RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone )" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig" - -src_prepare() { - cp -r "${WORKDIR}"/tirpc "${S}"/ || die - local PATCHES=( - "${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch - "${FILESDIR}"/libtirpc-1.2.5-endian.h.patch - ) - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable ipv6) - $(use_enable kerberos gssapi) - $(use_enable static-libs static) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - default - - # libtirpc replaces rpc support in glibc, so we need it in / - gen_usr_ldscript -a tirpc -} - -multilib_src_install_all() { - einstalldocs - - insinto /etc - doins doc/netconfig - - insinto /usr/include/tirpc - doins -r "${WORKDIR}"/tirpc/* - - # makes sure that the linking order for nfs-utils is proper, as - # libtool would inject a libgssglue dependency in the list. - if ! use static-libs ; then - find "${ED}" -name "*.la" -delete || die - fi -}
