Merge branch 'next'

5 files changed, 5 insertions, 5 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 20ba865d65b1..2b21e13ba243 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index b963fc3d2ab3..0f9d9f520cb1 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -5,5 +5,5 @@ DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056f
 DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
 EBUILD cifs-utils-6.7.ebuild 3226 BLAKE2B 4d0edab2d12ea2d8046995001c8c2bdc2d7ad580d901743e5fb5e104ae706768dd8f9ff0534b2b82cd6c5f36edba92d45b955e9602496befdc7bb1f561b51f68 SHA512 11d2651a795e9ff441bb4f80d02a6b568ad566190390477cc67dc5baf92fec15f8a1e195b291b2828bdb30b5dece1236ecffa907d5ef8c86a728ca43a0ec63bb
 EBUILD cifs-utils-6.8-r1.ebuild 3038 BLAKE2B c716960106acaa8a7cad9f4cb74ef9d5ae1c7df906728afb557baf909415fa78952bb06b83009c14eac739b03300ba40e67e6f6931969171f66640d2cd5b67ce SHA512 d5fd7ff2d03f6e21c413011855b61a79a64c2f9bcc90a7db4e4d0b49e863bac42e56b656765a78d172bdbf1071d89220d9ddb43b2ccb4071e40c842a1004855d
-EBUILD cifs-utils-6.9.ebuild 3006 BLAKE2B da015779271df5eeb6e043c3fc1c8e664444d640fae362a38a3e94489bb6d27825786f642f54eb820b54eca42e74d82a196b375cd8e79bd36e1083be789781fa SHA512 59d26ea7a68cfea6c8cf0ce0954ca58a925098e0809ceb93c7e9e8d5c75ed68c71c671e7d94d7d5d8f0ed9adc67ef49dafdae5bc1903f47cbe43e5c4d56dffd5
+EBUILD cifs-utils-6.9-r1.ebuild 3004 BLAKE2B da554ee7993f08792fbbcd4289b7461ef1dc099536e3ad39fa76d0319fb6ee07b038a8fa8d5bd09d9922e6c0747c1dbfdbbf3dfd0af8e4f581f262f3dcc7b253 SHA512 eda03ebd93597be1e963ee545520f18c87dc389210fb163cf5630aebbc03e1692f6da3ac20af903372bf4327d49dd36d7abfd3dce93f5b8a3ea8a4cf4bbb4b5a
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.9.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
index c757b0aed04f..588254fd776e 100644
--- a/net-fs/cifs-utils/cifs-utils-6.9.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -11,13 +11,13 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam"
 
 RDEPEND="
 	!net-fs/mount-cifs
 	!<net-fs/samba-3.6_rc1
-	sys-apps/keyutils
+	sys-apps/keyutils:=
 	ads? (
 		sys-libs/talloc
 		virtual/krb5
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 34c40be3e212..c858622e929f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -25,5 +25,5 @@ DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 EBUILD nfs-utils-2.3.3.ebuild 5534 BLAKE2B e70b34817cd313721687897c29622f66ac3c1c2e347f71a3ef6763d4693c121866e21dee282a9499661db2dfcf27a33a40a90cc80fe481859b402753c0ab1816 SHA512 f5afca6badb7be19d708632a624d535ffdd7abad2fac6ccc59295061f9354c5db66cacb841001dcc2039f5380a29e4f56450105311d42c38b7b2c60786a7373b
 EBUILD nfs-utils-2.3.4.ebuild 5274 BLAKE2B 8ac149fa4f44491d101a7fbdd283f7b0bfc1db7183c2622d54f0e39f1a3b477fc0ce52481d6ee13478e03e0f6dec08d04507e775a3851aab80c0f11586c18ad5 SHA512 97b33afd3742f740754502d991dbc2d99ddb4c361af497db0bc2c026315354bb45e82625c68a7ef198aa7f6dced68b325f82521a482a8d434bca24faa992aeb7
-EBUILD nfs-utils-2.4.1-r1.ebuild 5894 BLAKE2B f9568ff4f507190f60bfbf728b19f6809b5752f1089700b8d2dbc18a61af469962ab1044044f004bb2b2510bba6e32753d124a91bf5b93ff651795f4148951c2 SHA512 e8489c99b89fbf51163f94759541532d88edd4f72b020b2927922e8c1de1586653133d90702a7aeaf9a62acd9c872b2a824859a5325b6b1d9864c4b25f2cf753
+EBUILD nfs-utils-2.4.1-r1.ebuild 5885 BLAKE2B a10469ff0db08c9f593395e78653da622b9c06fb12592a0d0c5586e5c110ca3bdec60e9565b63415f7210387b5746ba1f6481003785aaed934f22df16fa1567f SHA512 e2f57b4c9761201305e8f70e161fb9704cd10899d8673ed643aa969a400e79d1022eab1053935f8bbfba9933d92d09fb027ef5003c19f1617907733eded72b9c
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
index 3bb65dad7568..f836166582d2 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 LICENSE="GPL-2"