gentoo resync : 25.08.2020

5 files changed, 23 insertions, 26 deletions

diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 969140a9dddc..5ef7bd18eebb 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,9 +1,9 @@
-DIST ntirpc-1.7.1.tar.gz 373327 BLAKE2B 55d71932e35b844e382409593b5dead30246d0cbaa27d3d49ad94d09435acb8abb34b945ba90ab7ba9733a955b4184ad839ba202aa82f97eeecbcc502cb88bf0 SHA512 9a98d83db94b4775940584cd08a1105b79263412d44309f91d1e86c609e6d56a482ac239efaaa73ccc1c2f4cabb8b597ccb8931514f33b8b2fd5c2a11b731106
 DIST ntirpc-1.7.4.tar.gz 373897 BLAKE2B 7354c5d6114947c8d66dcbc4fb933ab38237dd70eeb318278a658946fa4ec354bcaf7e90ac210f39f76b6d8e60f865c0c63ecbf7cbd8ee1e8defa0d7622cfb51 SHA512 076d789edc3fdf0ddb75437196b72b1aef78780d579ae4db0bcc116a1a92ac861fc77e1611070f2d3df003bfec7883ab20653a3c2f2255c685aaed8e7c22ce0f
-DIST ntirpc-3.0.tar.gz 386738 BLAKE2B 123c8f31ea532f6a01b4544d4f19d503c6e44ec8f3923f3f053f1ccc2ff5c5dc62da6464373b25a1881f69749a4c62395838be4451f3281ed9e7446eb8380255 SHA512 a7e9fdfcdaa2e85d4631094874bd72dce6c2e93924f6099f6bc20c98a1792839559ffb028b100aa3c5ec0140c10e090b32155439846276f918e9ba017271e14b
+DIST ntirpc-1.8.1.tar.gz 375019 BLAKE2B 3c774dbb762759f920e4159aaf5e4942c13837413bf72ab17298298a15278bc92332f8835701e0895f252596c21ba0d750c5f7f8afcf9104b8118745208fb1ec SHA512 a20749afb6d1f6216d6f5b6c9c29f6d988064d9cda8d3bfd855e62ba0ef88c7b47026d79c77be815c21eb91af0fcc6566af85df2401b5cef20c7ddfa5c5525b1
 DIST ntirpc-3.2.tar.gz 386961 BLAKE2B 920917b7ec08e2d4147785e1753596f035de684ffd92fb55fdf553bb4e19160e40fb829bd867d5a3a43f36568f731f71c31f135b6fe07fea2a6088f27ee3c6ff SHA512 8e9b5b3e607e28c4033c5986dbbc248d0edfeda6138b3ff51cc0760dccfb1cf4a14ff6bbec4330421b1175c3b1b04a34a43f314c97be2758fe0331b775f86021
-EBUILD ntirpc-1.7.1.ebuild 768 BLAKE2B 991c49a2c88cb8459f947ec4de91d46cd7935ca5d868a362acffc42ac135f921f895a653a9bb9701e4d091b72d875ea4bb78c9480ce8096a8822efd59cfe0fe2 SHA512 258f6102ef485cfbd40d03f12c342316904d39d7e82f4c9b8e1d44ce90980e16029a00485a516ed3b102d7bba0544eeb165772458b425930dfe05f288a4628d4
-EBUILD ntirpc-1.7.4.ebuild 766 BLAKE2B 1f0d4c49179f54e224348fb7131a8f91eb11611f3ac79495a69a281017c370f4f0088bf2eb8703de0d93a1e1a1e48c80181fd50297489a1f32e2ec1be7ca81fb SHA512 8d704f4ea19eff1dd3b13f9dc8aa33679c9711eba909dc6683992356c29f94cf7b90b6f6db5df0ab84e30cb57de8a9286ea6062ec4bef771119751b507be7459
-EBUILD ntirpc-3.0.ebuild 796 BLAKE2B bdc1af534de852b497f9162e0802ddbfd6168b7e599198db3351a67e5d5fa2cfbe962ebe109007245f5711b6462eb8fd3acd8f752b1d62bfac3b0e8e1eb5e161 SHA512 ff8c7111faad2e0d582b3f3dfcea4feb26b4a5e9dcbdb561ce55e678f9b2436e8b45c7dd7f466df18e023aae233a85f11edd2335e1ad2f48f88bd71cee68524d
-EBUILD ntirpc-3.2.ebuild 796 BLAKE2B 436b858e3c2226a248f4865238387bc4bf400d69e696b35ef5ac297d97af91d95551a4658af768788c7411f774a8f77ec1485df03d1629c549339c44709a8a04 SHA512 f5096de5126ab2b269b4a7680d75537131992b23215daef0f103ee908b1dc2e587405788a3dc1351dea3fcf918b988339fec61556d272678d1a654efac6c99c3
+DIST ntirpc-3.3.tar.gz 387212 BLAKE2B ee656510cadaa041b4ea389710f667021e07697744dd60ce71f4e856ed91339cc5373bba771ba6bcc09d86e32502339bce7fb1c7e8ae411ec38ebade87cdb735 SHA512 c5586be51960c682f719dc0aae21846cb1af6bab10c1d3b946570508947d281f776595e2f0d12edddd9d0289e737fc2fb823ed5060dba6b6e5c6b01f28c84cde
+EBUILD ntirpc-1.7.4.ebuild 742 BLAKE2B 93c4145127a2f983cc2b191c6b44efa9e41341ba5302ee64c2677e5f890c55490e10f95b9b0e42b736d882519c934c2901b98eaceb7c717183167fdab0653fcf SHA512 3fa5703d9a040e0ac6d7a39238a883c78d571a8a13c0a6ced4bea0d680062300e3e65a3ee2d0d39ff49621c76dd8a70403a6da815b35ac0200c8cb957866b9d4
+EBUILD ntirpc-1.8.1.ebuild 729 BLAKE2B f6091c215b71993ce7bf0f2e98883b8ff46a6e2ff01b11a558cde8a969089d23160e4175029ba96621e3c6bbd9c0b40db1280d91ed4e1c0f591ee6ea6cb66d23 SHA512 a044725c4b0b359f304e3a6e27e9b8c4d228adee6da442384a4b79b6cb30b9d109b4925f819f44db2219d96a8fc4ccd48f715a6083cb324d4b4f2f72cbffbd73
+EBUILD ntirpc-3.2.ebuild 772 BLAKE2B 95943668a81b6c31748a2b31d28ef1519db8439b75deba668f79fd7c1a71f18cacfdbe99e675c4f5f1d5849b4f49b06acaed9cd65bbb90c55350798f5b839a4d SHA512 958676bc8a9cf9641aab4a51b7328aac659b92771e59bea9861b8769dc069de76b5f630c33aedc4acc14c3b82d5d9eedb9ac312b5dadf9b415562d84466d39cf
+EBUILD ntirpc-3.3.ebuild 735 BLAKE2B fda86f45c8b96b14197e772659e34b779b3c2813ad47468ff2b57eaf0608e9d7ef7bed29850cabf8abf378c84f77fe8e9b1bd8b0445d47f1158a5b2bd7fe9f56 SHA512 49d1d92954d8c4f6fafe04a55fdd680358b31fe5405951ac821348097f2c6ee6732f2dc301a1b78f8b00600c0406a7d09ce13cd2338590fd2d640261487bf491
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-1.7.4.ebuild b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
index 97b6f9397aba..bded25ea259b 100644
--- a/net-libs/ntirpc/ntirpc-1.7.4.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -21,10 +21,10 @@ RDEPEND="app-crypt/mit-krb5
 	rdma? ( sys-fabric/librdmacm )"
 DEPEND="${RDEPEND}"
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ntirpc/ntirpc-1.7.1.ebuild b/net-libs/ntirpc/ntirpc-1.8.1.ebuild
index 888c3fea1167..7ec7709e46d4 100644
--- a/net-libs/ntirpc/ntirpc-1.7.1.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -16,15 +16,14 @@ 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="app-crypt/mit-krb5
-	net-libs/libnsl
+RDEPEND="dev-libs/userspace-rcu
 	rdma? ( sys-fabric/librdmacm )"
 DEPEND="${RDEPEND}"
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ntirpc/ntirpc-3.2.ebuild b/net-libs/ntirpc/ntirpc-3.2.ebuild
index 590f6fe9b48d..7027d1cf5ede 100644
--- a/net-libs/ntirpc/ntirpc-3.2.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -26,10 +26,10 @@ DEPEND="
 	${RDEPEND}
 "
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/ntirpc/ntirpc-3.0.ebuild b/net-libs/ntirpc/ntirpc-3.3.ebuild
index 660a94304bdd..6e63e824706b 100644
--- a/net-libs/ntirpc/ntirpc-3.0.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
 HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
@@ -17,19 +17,17 @@ 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="
-	app-crypt/mit-krb5
 	dev-libs/userspace-rcu
-	net-libs/libnsl
 	rdma? ( sys-fabric/librdmacm )
 "
 DEPEND="
 	${RDEPEND}
 "
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DUSE_GSS="$(usex gssapi)"
 		-DUSE_RPC_RDMA="$(usex rdma)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }