gentoo resync : 25.09.2021

10 files changed, 26 insertions, 19 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 48e33fbb1ba0..4672497e13e0 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index d1f993d89022..22e1db97ccf3 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,8 +1,8 @@
 AUX cvmfs-2.7.2-builtins.patch 3672 BLAKE2B 80c5851c45150384a2c40b962f1e58b2bde5e1111c3b8c9f18aef126569ffd13461408abacd29d6990db3c5633e987440da34a09ecfb0193ec8e3e1d6c3c2328 SHA512 f064cf7d9c8cbbfec68fc67bac4c91c7266b8eabc0be28b30ce8402d39a1a95d15ef9c929a7ef5f887e3058914717c1906e2f0b749fec89475a7a68b1a7f1d54
 AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370db94d715e2ce97ddad22fbc16e85c8c602a2c561ae859e2eccb973144bd803d279029a14f9f591f641265ac9e89e89aa1 SHA512 3a525c50165c83a7079f7d1b51441e7a1e6c230ac76d742b7833506c98f13685339dcf86d1c8697086b195ff33775996e2f9d6e0d825cbdedc190aaa3ea427d0
 AUX cvmfs-2.7.2-xattr.patch 717 BLAKE2B 48d595b0219b62a3ac45e46d51e3910d6124edc89669ae8996a49e95331bf9d32b4f1eec8c6df76f6906594c3da4a89665b6457d3aef9dea96d2af3959c5780e SHA512 9be285da46f52d59ef28f666bee2b0b372d76cbb786f225a533239ac7683fdef6092aaa7d62458a89bc647598e12611f025060c37c0539071feac71b262e57a0
-DIST cvmfs-2.7.3.tar.gz 43123803 BLAKE2B 39d11f9dd69e36897c501bd4b24c01a13fc351d1251cd9a7965fe46ddf0c8128c3c976bb747d477d5d5231aeef09cad38337bb28c343c1d7bfbd915af02119cb SHA512 94940a09a713c14f776914b74bbec8794637b98b42ffcbab36e3455c0ea83219ae6f0eebaf41a62d1abf05134aada0abfd521dec793b2fec015458b80f387bfd
 DIST cvmfs-2.8.1.tar.gz 44117247 BLAKE2B 3505747833779463df79e40c03359c8458d51d2e4635ce6bc7ac080112ca4e81ca914dc6866afc28094e656acf8e3051749ec278e00b8357a50dd530fc2b65be SHA512 3ca4a45e24e06e4ea46a708b3e47fafc4c6eae172c296b091c8d0fb6b2d21c64d4b8975baf7f055101a9d68ada1e3082e7ec808da3fdaf68b5a3a3b5c4ed7731
-EBUILD cvmfs-2.7.3-r1.ebuild 2186 BLAKE2B 6232ad5193daa5a0f89667f7c22b634127955816e2f22f1e0fa699b0903af2d90f895deccc5c8fd6285e0a5bbdb94d7ee84b7bee612c6b29ee4ee6cc76ad5bc9 SHA512 b261bf73106355c3048b218e1e0664995766b2fdc4f74102db95d18182915279fd8909396272259c0235c9895a94ed47a320b7ee8547326b47b121f358d62ab7
-EBUILD cvmfs-2.8.1-r1.ebuild 2357 BLAKE2B 05c4bcb0d895ba56e436140149d8f1ffca43c20cf76acdc4303fa6cb99d39aac6a074d3600ec000d5a77ae7a21b89d268bf665cac5388aa10bbc254aee243672 SHA512 742fe39ba2c859924c79e57b0fc6c26301bc8f3e106902e09d0b07608d51c1ab7badb7ee4142394b8c5a3c6c15f63682bec09dca93827073ada63649167d0e03
+DIST cvmfs-2.8.2.tar.gz 44130007 BLAKE2B 3c15c3549971deb418ee142bbec0db8ae272d0fe5371e618460e31bd2c083ff1d1c00e5bc3520b199fdf3297cad278185617f51a217f75120dd71ea792a7a8a8 SHA512 a3a1a6d4eb36248744145393d6ebe5015f8f1d4506bb9adca13b19f68a2e57cdf77fc0e7202ff4e8a927bff3a6e1808f9c740755145b860f2915a31ec9dd5fa3
+EBUILD cvmfs-2.8.1-r1.ebuild 2355 BLAKE2B 97f4b6d8265206ed2be8e658e9bb4dd5ac50ae40e096ccfa854b03b14f7d9611b8a9b43d5df23d2c78925af2f5354e282cca4d9ace88baeab1f71149fc79980c SHA512 3f8e1ebd203471bfefa93da5b49bb19a55a617b995b33b0129d538af07c4c994084d74a9e4e55e712fc20358b11e9e11825fdedd3fec87353cc16d008f950db4
+EBUILD cvmfs-2.8.2.ebuild 2357 BLAKE2B 05c4bcb0d895ba56e436140149d8f1ffca43c20cf76acdc4303fa6cb99d39aac6a074d3600ec000d5a77ae7a21b89d268bf665cac5388aa10bbc254aee243672 SHA512 742fe39ba2c859924c79e57b0fc6c26301bc8f3e106902e09d0b07608d51c1ab7badb7ee4142394b8c5a3c6c15f63682bec09dca93827073ada63649167d0e03
 MISC metadata.xml 1446 BLAKE2B 17b4b0170f3aa7e4ebbdc7d2bbd1b851a6e11b08338ecd9e441dc98a37b9dc5b9b952ef57b367b7e5991a7008f893fda2289c2e391fe8b3ceca112203b02ad00 SHA512 3e759f757e392a13efec745e56a1edabe32ca1c64372ba41b3919f312a81f2e1cb486009baec38704325d466731782d44edd447dfee28607eee9ac75924ac97e
diff --git a/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild b/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild
index 294027c7e2b8..a80ba78c2a1e 100644
--- a/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="server"
 
 CDEPEND="
diff --git a/net-fs/cvmfs/cvmfs-2.7.3-r1.ebuild b/net-fs/cvmfs/cvmfs-2.8.2.ebuild
index 877a5371c7f2..294027c7e2b8 100644
--- a/net-fs/cvmfs/cvmfs-2.7.3-r1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.8.2.ebuild
@@ -12,8 +12,8 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 x86"
-IUSE="doc server"
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
 
 CDEPEND="
 	acct-group/cvmfs
@@ -42,9 +42,14 @@ RDEPEND="${CDEPEND}
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
 "
 
+PATCHES=(
+		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
+		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
+		"${FILESDIR}"/${PN}-2.7.2-xattr.patch
+)
+
 pkg_setup() {
 	if use server; then
 		CONFIG_CHECK="~OVERLAY_FS"
@@ -54,7 +59,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.7.2-builtins.patch"
 	cmake_src_prepare
 	# gentoo stuff
 	rm bootstrap.sh || die
@@ -69,7 +73,7 @@ src_configure() {
 		-DBUILTIN_EXTERNALS=OFF
 		-DBUILD_CVMFS=ON
 		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_DOCUMENTATION=OFF
 		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
 		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
 		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
@@ -85,8 +89,11 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
+	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
+	bashcomp_alias cvmfs_config cvmfs_server
 	dodoc doc/*.md
+	keepdir /var/lib/cvmfs
+	use server && keepdir /var/lib/cvmfs-server
 }
 
 pkg_config() {
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index a6d019c28b59..bfd70ae61285 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -13,5 +13,5 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
 EBUILD nfs-utils-2.5.3-r2.ebuild 5780 BLAKE2B 7465645f72e7882744a2336c0ca59e3a68efe334f9e81596c448abcc36adbc00448a6cf9e5d56ae4e06d36e14e6cd598e52a529619f37cbfd5d6b7c2f5c97fcf SHA512 7bce17cb7d41a5fa98f47cd8292ce90e82dd7e7a486d24da44a3c6d04363e895aca050cbe211e62792f4c2d810f95581d224bfae431eb59035c7b45b9c720bd4
-EBUILD nfs-utils-2.5.4-r1.ebuild 5780 BLAKE2B 7465645f72e7882744a2336c0ca59e3a68efe334f9e81596c448abcc36adbc00448a6cf9e5d56ae4e06d36e14e6cd598e52a529619f37cbfd5d6b7c2f5c97fcf SHA512 7bce17cb7d41a5fa98f47cd8292ce90e82dd7e7a486d24da44a3c6d04363e895aca050cbe211e62792f4c2d810f95581d224bfae431eb59035c7b45b9c720bd4
+EBUILD nfs-utils-2.5.4-r1.ebuild 5779 BLAKE2B 94982a409df4634131ff2eff8cee11d88e9b22519c4520b562a133087557f65f2a71f7dd28abf834f25d23d97a1785a2eda3610846b05be2c52cab55216bf11d SHA512 87c5a3112e05dbd20e92639dcec2dd24513576ec9ca12cbf8d44fa77680aba293a3b072e93ca70a6a26389e96383ff81bd65db70bdf37e4c131a08c7d67d9a65
 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
index 75b24ff6761b..09b5abbe4c36 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-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 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 5e6639d2dab1..64ed05522f1d 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -8,11 +8,11 @@ DIST samba-4.13.11.tar.gz 18476158 BLAKE2B 43bf88a62078c980e274ad978be0e7de46afb
 DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
 DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
 DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
-DIST samba-4.15.0rc5.tar.gz 18873299 BLAKE2B 2b2af09d04fad612d67a244590457189232f9a11925d8bb9aa278c64e148034551c0f6d6c7e76a633ad3a3f3c626f998946b8a8596d017301c758725ac2ff81d SHA512 bbdb37cf345a6c0765b5cd361cc858dd4496524bfbf0cdbe15876fe2284d8c39c5835bd5e5c686e9be45712f25aa158c624a2a719c5351f110c367e51443ba0f
+DIST samba-4.15.0.tar.gz 18895040 BLAKE2B ac560e280d5fbea6499547de480f973bf1987558ce6b832fe0f6e5bad8cd58180731e7d1a37f85fce82c52bf735106aedec3ccfda09fa430a5c435e2437994f9 SHA512 5fcd8797f0ac2821f1bb213c9a39c0928847905f701003618f9f160eaa98f3fea25e3d8d4047658b0bd164f3e6a2a63fd7b0133317e536997c764acf7803950d
 EBUILD samba-4.13.10-r1.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e225007ed17ff9141119b3dad161db3405e56d49797e727cbf8a4ae0077f53db28f1d459f75ba59198585ef103a3beab9 SHA512 ee3d5d92a99ff087a728432ff5033163ed6513f70cf27ddfe891c46f3614318089cbf4c65d62b029f46a8b26de9544e39d65f5d99a885e0e2289e0a0366a0d8e
 EBUILD samba-4.13.11.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e225007ed17ff9141119b3dad161db3405e56d49797e727cbf8a4ae0077f53db28f1d459f75ba59198585ef103a3beab9 SHA512 ee3d5d92a99ff087a728432ff5033163ed6513f70cf27ddfe891c46f3614318089cbf4c65d62b029f46a8b26de9544e39d65f5d99a885e0e2289e0a0366a0d8e
 EBUILD samba-4.13.9-r2.ebuild 9942 BLAKE2B 7bee9ff108d961c7974c3605cfeb5d9c58094b379079bfae49b7c6623bc3bcc0ae6e6ec698d190e4ef96a1948b514e3aa3dc6f4e6bc1fb63a5b9535e2de452ab SHA512 a79bcfd3bf0a4576bcc31468ccad7c73a59bb921e40641f23f4fbf2267ca0ee48967279141b7ae24283df730cda43be00f59a374565b30045a38567936f75081
-EBUILD samba-4.14.6-r1.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
-EBUILD samba-4.14.7.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
-EBUILD samba-4.15.0_rc5.ebuild 9929 BLAKE2B 1ccd2656c7658a2df6c629f0775e1042d486389f2f3ef59f7f7391b7e8f2d4834d9643ea974abe43f88cb1862a299218f4479ff89eaa27458842c08e4f8819ec SHA512 534f6c04fed2f6b8e73a183dcd4d434a77deed0a1e8446e4092807e280efc717eeeb08dc701da28de000523c6d78c445a93c2b1014e990ff2997e1c83f85287b
+EBUILD samba-4.14.6-r1.ebuild 10057 BLAKE2B 09c03bddb265dfd9e7fd42dbda35e7620d2fa67553847b3736de1be865e6491fa3a5ef599bcdb81c42ff14511b6513e023f25cdaecbd8a7121fa2453af82dc3f SHA512 fff09de14784eddc05c6e23eb56f94931cf7d9f73e326a77af1eb2b9be62efaa1793c1eb96ac43ef759910a9d651308b648ddaeedb32ecfd48438ff7678dae9d
+EBUILD samba-4.14.7.ebuild 10057 BLAKE2B 09c03bddb265dfd9e7fd42dbda35e7620d2fa67553847b3736de1be865e6491fa3a5ef599bcdb81c42ff14511b6513e023f25cdaecbd8a7121fa2453af82dc3f SHA512 fff09de14784eddc05c6e23eb56f94931cf7d9f73e326a77af1eb2b9be62efaa1793c1eb96ac43ef759910a9d651308b648ddaeedb32ecfd48438ff7678dae9d
+EBUILD samba-4.15.0.ebuild 9917 BLAKE2B d51176e0eb13f3d1807767505f075ba522cf8cb6cc28623039124a1ebb141d7ad1c1100561d347f6ec0283a358d8dcbaaf706e31712d5a7fc8d7253bede571da SHA512 916741315bac02da012a33bf7891c4084534f3e33f15eeddb22fdf641aaa9dd50a1d26cccc0f6a85d12a6809b4373e636d60a6e026e3af27f4f043d089ae9618
 MISC metadata.xml 2166 BLAKE2B 147e131d456bd90334b48d551e47ce92f0fd7a0708df2f4cce0ffeb3f2e541689090f8edd043411d982574285e06a1b31fb087c18bd02b1296c6e15ccd0b2e92 SHA512 332354a6247d9ef8d50b71e07c66a10fcfbdb34dd876490f8517d0275d87a7d486789c19824c7ccd9066148a92ece3061649bd7ac0b7280cbc695c92ec70ef29
diff --git a/net-fs/samba/samba-4.14.6-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
index 52f211eaa846..c0aa243a9452 100644
--- a/net-fs/samba/samba-4.14.6-r1.ebuild
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="
 			net-dns/bind-tools[gssapi]
 		)
 	")
-	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
diff --git a/net-fs/samba/samba-4.14.7.ebuild b/net-fs/samba/samba-4.14.7.ebuild
index 52f211eaa846..c0aa243a9452 100644
--- a/net-fs/samba/samba-4.14.7.ebuild
+++ b/net-fs/samba/samba-4.14.7.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="
 			net-dns/bind-tools[gssapi]
 		)
 	")
-	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
diff --git a/net-fs/samba/samba-4.15.0_rc5.ebuild b/net-fs/samba/samba-4.15.0.ebuild
index aa5b6bd183ab..3dad3bec60b7 100644
--- a/net-fs/samba/samba-4.15.0_rc5.ebuild
+++ b/net-fs/samba/samba-4.15.0.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
 			net-dns/bind-tools[gssapi]
 		)
 	")
-	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )