gentoo auto-resync : 28:08:2023 - 16:02:54

5 files changed, 19 insertions, 37 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a2d0f7e31578..75a13e7c2871 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 6f5d14375d6f..53226114d157 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,5 +1,4 @@
-DIST ntirpc-4.2.tar.gz 388418 BLAKE2B af875834515ae84d324302f2c0a36a7f34bb60ff95d2e30372f21541d558cec4337955fb72f1fbf43e3fcae75d706441dee658420bffe1f315578959405afb72 SHA512 fe241e3ac0e988d42425fe14c84970577693bd9ab1831069c753a18369150fb236fafea3d9b6c9d93faf93e918a93bf5367b914db819762c76e432ccffcb9328
-DIST ntirpc-4.3.tar.gz 388433 BLAKE2B 5d9051f6cad28d89172a85c6f0b9fd4fa81d34a90e1677822f3e9f0a11cedbbee7aed40456edc854f71aa92f9dfa6d133537453b7da3d9967293b1ecec4c8a55 SHA512 4728cea5ee920e96dcd0b94784c72d2e75b95a3de6599127531107e14676b10704d37180afe918315d818ced79d40eac4999eed69cf07ebe9799d68cdff1a758
-EBUILD ntirpc-4.2.ebuild 735 BLAKE2B 9f97aa546f67d95e4d42d0db6fdfec43cdefd99a518f5839e41d0095d6d6af6bd847bb4c37929225ac5692e9c5cc4e9e06d656297f2784a9a65ce2980c2a0269 SHA512 8a6625376ae49f8e7c623659db98384d13911140dc44ca74e0f35b88abfb7ed00eb7fc3ecbf61a7adc06a8794e4c6b7db527bdfa832cb54b84a28cf05ea3e95f
-EBUILD ntirpc-4.3.ebuild 735 BLAKE2B 13bbee53c79bd62c0140d8ffd0dd766b9d9b4f31742b73512bcbf6c411dad27485184f3de38e263b6f800fbde9e20febe43aca4cbc531cb5807f9a13b6dec9f8 SHA512 ca1953622d2c0cf7ad3c7e5946577e510afc037f6d7a5aec184a75e16875d0394a78825ebecf8fdbed510d67448e6578cb0ca624434c8354930e1a06b17012e9
+AUX ntirpc-5.0-include-assert.h.patch 211 BLAKE2B 7f309e01aed7bae35189c74e65e1ebcace02481ba50dc323f3c254917d8243f6839d144506d08fb9091fac1612d950e26d815dfa9ea24902dec54b60fbdb6d62 SHA512 d565de3d333600a70c748c6abf57415f532a538da08847be789e702d35ab94391e0b92f69f210eaaff519c038d06a1a6a44046f72574c71bcc71f66201de7954
+DIST ntirpc-5.0.tar.gz 390950 BLAKE2B b97265eb0af7964b9810f2b4e285531bdd467c9b7385cfcdc75987a6c275e5675d2044e05f560e27a6d5cd4af80b6b27e484ce7cd333878dedf6d1d5fa1e434e SHA512 f73a1bf8a7188bd3fb50ce735ebd18dead63cb93ea8c347aef267082673c40580402b0381d1ed6c7fdecf7752718c059e406dff3051a739632ed8097eccc6646
+EBUILD ntirpc-5.0.ebuild 786 BLAKE2B 854d85d7c8cc1c850291d20d4c587003f68430a0b2af2b7d5dfa9a258947e10c67bb50e813a033373da9d2bc9783cf734eba6ac15214f70f8e1186ec936aecbb SHA512 12934534890cd608625f877265547a7a69ecbc2d44387ee3aa9c94e761bb51e727f728c598c851330e1495b946dc9763747359390a1ab9880810bce240f58cb7
 MISC metadata.xml 438 BLAKE2B fd74e8f98efc4037a229958d5b2887308a1bed529fc5586075d5eb4af6e2624d1fb2540735826b7b4c48d21167ecd2a351e5a4ac46b3cf6e0aa751a4036f29fb SHA512 b8ac2eaf12f97ce0aa35bedecf0446a9b59c9320dfbb1d12ee28fb678a399b88d5c78e4255f4b1c8ac84478feac904449b1393e7468137b87e9b2064b7abc170
diff --git a/net-libs/ntirpc/files/ntirpc-5.0-include-assert.h.patch b/net-libs/ntirpc/files/ntirpc-5.0-include-assert.h.patch
new file mode 100644
index 000000000000..ad52bbcda007
--- /dev/null
+++ b/net-libs/ntirpc/files/ntirpc-5.0-include-assert.h.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/902995
+
+--- a/src/work_pool.c
++++ b/src/work_pool.c
+@@ -39,6 +39,7 @@
+ 
+ #include "config.h"
+ 
++#include <assert.h>
+ #include <sys/types.h>
+ #if !defined(_WIN32)
+ #include <netinet/in.h>
diff --git a/net-libs/ntirpc/ntirpc-4.2.ebuild b/net-libs/ntirpc/ntirpc-4.2.ebuild
deleted file mode 100644
index 4ef6001a06c1..000000000000
--- a/net-libs/ntirpc/ntirpc-4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
-HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gssapi rdma"
-
-# Since the GSS option only controls some extra files to be enabled,
-# there's nothing to list in the depend string for it.
-RDEPEND="
-	dev-libs/userspace-rcu:=
-	rdma? ( sys-cluster/rdma-core )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GSS="$(usex gssapi)"
-		-DUSE_RPC_RDMA="$(usex rdma)"
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/ntirpc/ntirpc-4.3.ebuild b/net-libs/ntirpc/ntirpc-5.0.ebuild
index e512976e7517..c6d615747227 100644
--- a/net-libs/ntirpc/ntirpc-4.3.ebuild
+++ b/net-libs/ntirpc/ntirpc-5.0.ebuild
@@ -22,10 +22,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-include-assert.h.patch )
+
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_GSS="$(usex gssapi)"
-		-DUSE_RPC_RDMA="$(usex rdma)"
+		-DUSE_GSS=$(usex gssapi)
+		-DUSE_RPC_RDMA=$(usex rdma)
 	)
 	cmake_src_configure
 }