gentoo auto-resync : 07:02:2024 - 21:58:53

4 files changed, 9 insertions, 93 deletions

diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 3259a7f60006..6be178945f8d 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,8 +1,6 @@
 AUX libtirpc-1.3.3-release-version.patch 3090 BLAKE2B 3578e2f9ac0dc6479d790c9bf20850d2be18bdfa7819e9f36861b679ce718f84c74dbb79a403fef4f1c7215e5b8e5c14cdc56b9f8b79d4ac3536630fb2d91d12 SHA512 74ff64a9d9c6cb4eb899d43899c7bb306709ecf6748989a056a78296101b6258d287f7f348fde05ce053eacdefe36a62752756cec3e361a9bb5fb671d7598a4f
-DIST libtirpc-1.3.3.tar.bz2 562812 BLAKE2B e229869b05103d912b677f78648dce1f7fa7649bdf44b782a5fb97635eecf07f768bbc0ef25c0f065c8253fbe37c12b80934d9102b7345adfc4102897458b487 SHA512 df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe
 DIST libtirpc-1.3.4.tar.bz2 563292 BLAKE2B 33371e83e9f54e9d6d434b75d3a95bedefce63050846483471e302b1fbb3b63a18db90b652050c43e1c6e42b03e34bafb2fb6ae89787f05af0cf747319825424 SHA512 004e61b5853717324790c46cda5ff227d525909f189194ae72a1ec8f476ca35d7f4c1f03c0fbc690c1696d60a212675b09246dbe627fdbf1a9a47f5664e82b00
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.3.3.ebuild 1876 BLAKE2B a7c43b9aa8f21bfdb9027ecba79d820707cb5e0ac11e6a3c468e8b719ffaedfee0b3c30cb3019cb53047d53dac07cdeb5ac243d4d9aa3e5d9d557fea480f6cfd SHA512 400edb880e669a5267228e40abc275925ca92c6a34b3dc1524f8177668d330bbeae0df3c8943c11e454976fd505cd9e960118c94db048335160dc9e3ad6fc960
-EBUILD libtirpc-1.3.4-r1.ebuild 1611 BLAKE2B b31e6c7b10addeac2ea1a729f05b0371a7b4587d633bb40afd6b51bc3bdc8ad7cf081f77151a4f9c1062c11b6871e2fac466f3bc04429f547f19e7b0fc30a71f SHA512 3361ef3a93b159b8d3dded5d8d4c2ddc72c0abd16079f8f1566786a15e26a5ad2c39e2c9a9d50920345e79a91470382584c22d7f14ddd89742f228b9200b19d8
-EBUILD libtirpc-1.3.4.ebuild 1828 BLAKE2B b4fee49e97ccf2d8c7f3cbad073b1588e20f06878192ad6f17185d00cb339f59e6e5185ce3367d21155a3dc2b94bfb36e74b09bc8891192e01241a9326c9d633 SHA512 a8b986563663f4814c2f156b711acbfc039b56850ddea7e0a4a650498a328547ce396a3a19223ccf773fac2f9ed6e08c53c5884b9fd79c3ab51e99b7dca47eb4
+EBUILD libtirpc-1.3.4-r1.ebuild 1632 BLAKE2B 9529372c1f04b80495f3fd6bc9279ef4b98b3f696e1ff7f66d22f367b96efaf3073fd744feafbb53f1d303fc81cad9bf8e7007970e4f39a9c19a1d2c293bb5f2 SHA512 626423c26511ad4219e528b9bf7b38e5515a9a9b73161e58a3ca4b99a07771e31331fe575722b5702b0c11cf4b88a33624e1ab0525069501ddf86a2f28f91fd0
+EBUILD libtirpc-1.3.4-r2.ebuild 1500 BLAKE2B 69c169a189270f0d9a9f4c5ab135723ca91ffe42fbc38097012a567ca5f8759c9a4a55e90b556208f5901a0144df854dcab2332f3e0e8eb3f47ce64f83a2c050 SHA512 3b909eae6d867cec4cecd475c7707824dd18943ad386d8445c2164fe86d306a5aaa2756c8c9ff31a52f1b5fadf9e2fc842d3c41711fffbcbea31fa53c9f05d2f
 MISC metadata.xml 405 BLAKE2B 3006391cb2dac9927f450164f2705d31c35172560ddb436edb76f6c56efc2915a63d57e5be8835801b3b4bbe77526cdaf681b49c4fa43285549b7f0707af4814 SHA512 63489cba710ba40c334508406bf10c28ddc2133cd3eab86afde1670e3d4bb126d0e77abb45c99fd7b6abd438a9e7cc5a10b6742563be51601c7945c87419c928
diff --git a/net-libs/libtirpc/libtirpc-1.3.3.ebuild b/net-libs/libtirpc/libtirpc-1.3.3.ebuild
deleted file mode 100644
index 1533f24eee74..000000000000
--- a/net-libs/libtirpc/libtirpc-1.3.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
-SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-release-version.patch
-)
-
-src_prepare() {
-	cp -ra "${WORKDIR}"/tirpc "${S}"/ || die
-
-	default
-}
-
-multilib_src_configure() {
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
-	local myeconfargs=(
-		$(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.4-r1.ebuild b/net-libs/libtirpc/libtirpc-1.3.4-r1.ebuild
index 5ac63b344156..62c758d3a342 100644
--- a/net-libs/libtirpc/libtirpc-1.3.4-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
 DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
 HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git"
@@ -31,6 +31,7 @@ src_prepare() {
 	cp -ra "${WORKDIR}"/tirpc "${S}"/ || die
 
 	default
+	elibtoolize
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libtirpc/libtirpc-1.3.4.ebuild b/net-libs/libtirpc/libtirpc-1.3.4-r2.ebuild
index a0fa69a46c02..ecb97a9dfb69 100644
--- a/net-libs/libtirpc/libtirpc-1.3.4.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib-minimal
 
 DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
 HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
@@ -31,15 +31,11 @@ src_prepare() {
 	cp -ra "${WORKDIR}"/tirpc "${S}"/ || die
 
 	default
+	elibtoolize
 }
 
 multilib_src_configure() {
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
 
 	local myeconfargs=(
 		$(use_enable kerberos gssapi)
@@ -49,13 +45,6 @@ multilib_src_configure() {
 	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