gentoo resync : 15.06.2021

3 files changed, 2 insertions, 64 deletions

diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 6d53d75bb506..f0aec12294f8 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,6 +1,4 @@
-DIST libtirpc-1.3.1.tar.bz2 513399 BLAKE2B 8cc42292cdbde55a0095669bd9ccb3666b9e33d6ec9880ac79d034d42155d1b585f4181ff92f8290d7b5cce01bace2629d1ddfe0d61813f00851216f2be5ed0d SHA512 131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc
 DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.3.1.ebuild 1478 BLAKE2B 966d8a329908ac935ecb62303453fc382424414f020791f6b3a12feee8b347b59151b15a75e1909a727b1b3e23bea42232ae15343beaa1580656f3e5533f1854 SHA512 93f7f1c03e4e244da42e2c9c18dfbf8c162e230639947597b23266c2b12d533260f12287552434bc40f0e42b997e5c120936ee770053cf8fab33f9cd81d08c6c
-EBUILD libtirpc-1.3.2.ebuild 1486 BLAKE2B fac35adc99475188422ac8778a00813e267efdd0038cd9a171dc46e38f7a3a40bd900bd64f0483ecffb22c20cfd1d0b7511fe7a7faf0802f5ebc7da80957a965 SHA512 b6fcd1166746c6ecf054c85dc9aae480d43bbaebe1a91de8b28c37f957f80054911704be4ff5936c3944453d8fea7904e1c7bec68c9f91a339910a8055cf70a1
+EBUILD libtirpc-1.3.2.ebuild 1478 BLAKE2B 966d8a329908ac935ecb62303453fc382424414f020791f6b3a12feee8b347b59151b15a75e1909a727b1b3e23bea42232ae15343beaa1580656f3e5533f1854 SHA512 93f7f1c03e4e244da42e2c9c18dfbf8c162e230639947597b23266c2b12d533260f12287552434bc40f0e42b997e5c120936ee770053cf8fab33f9cd81d08c6c
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.3.1.ebuild b/net-libs/libtirpc/libtirpc-1.3.1.ebuild
deleted file mode 100644
index ec87a4616753..000000000000
--- a/net-libs/libtirpc/libtirpc-1.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal 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
-	default
-}
-
-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
-}
diff --git a/net-libs/libtirpc/libtirpc-1.3.2.ebuild b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
index fea15bb4317e..ec87a4616753 100644
--- a/net-libs/libtirpc/libtirpc-1.3.2.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 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"
+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}] )"