gentoo resync : 17.06.2021

3 files changed, 15 insertions, 24 deletions

diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 680c99b3b7cc..136a2c90ec98 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -2,8 +2,8 @@ AUX cvmfs-2.7.2-builtins.patch 3672 BLAKE2B 80c5851c45150384a2c40b962f1e58b2bde5
 AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370db94d715e2ce97ddad22fbc16e85c8c602a2c561ae859e2eccb973144bd803d279029a14f9f591f641265ac9e89e89aa1 SHA512 3a525c50165c83a7079f7d1b51441e7a1e6c230ac76d742b7833506c98f13685339dcf86d1c8697086b195ff33775996e2f9d6e0d825cbdedc190aaa3ea427d0
 AUX cvmfs-2.7.2-gcc-version.patch 2482 BLAKE2B cf184820140669a15f4051e8d0f9a41ae8625bb7beebeabd1a2021be0b5ffa4ed915c92a980229f1692f5f2e4145a08356a89ec8f2e3cc8963f04af157c090df SHA512 c59d2b33d41467d31d6095df20e7a576a02f39fc0ff1a2938afaa30929cc3b4178cf99d1eca3326551eba982adda0b5eed7f2a11348b23a43aa2e921b983e89a
 AUX cvmfs-2.7.2-xattr.patch 717 BLAKE2B 48d595b0219b62a3ac45e46d51e3910d6124edc89669ae8996a49e95331bf9d32b4f1eec8c6df76f6906594c3da4a89665b6457d3aef9dea96d2af3959c5780e SHA512 9be285da46f52d59ef28f666bee2b0b372d76cbb786f225a533239ac7683fdef6092aaa7d62458a89bc647598e12611f025060c37c0539071feac71b262e57a0
-DIST cvmfs-2.7.2.tar.gz 43121950 BLAKE2B 3f9b23709f7fd7d21f0c141388df9b3f59c0c9ed8c4b27ae4071cff919e6d04eec1c80fe26a70b421d554969d35cb18f1a700be67f046a1a5d53d73a9e64bbe2 SHA512 35f4d949b4f2d002e6ef07e61cd443e55b30031a396f9850fc8d511b2ea3fd37f12e340828878cce151876f7391459f5bb13f0fe325070567f2876eb50185149
 DIST cvmfs-2.7.3.tar.gz 43123803 BLAKE2B 39d11f9dd69e36897c501bd4b24c01a13fc351d1251cd9a7965fe46ddf0c8128c3c976bb747d477d5d5231aeef09cad38337bb28c343c1d7bfbd915af02119cb SHA512 94940a09a713c14f776914b74bbec8794637b98b42ffcbab36e3455c0ea83219ae6f0eebaf41a62d1abf05134aada0abfd521dec793b2fec015458b80f387bfd
-EBUILD cvmfs-2.7.2-r1.ebuild 2517 BLAKE2B 608d5bde89d45917afe51e8a26a4cceb4b07feee14a52c664698ce226950660266e70b57e53b0853572ca885047b36885c90996b0e6e1607b2d4dbefad508ecb SHA512 cc9a6ad42acfe31d4b58b6a045af71f58b4824f4e513c288ee5f4467827874045df8ab08ca38ad86f373bc6a34f0be33d91181ab2c51a9932a92108b26d9f4f8
-EBUILD cvmfs-2.7.3.ebuild 2195 BLAKE2B dd8a8604023e603596dec028d4c6b49e0ff71e4d1e93653d1c5a1c0c720dc913e3ca9a4fcec1605c7a621b12d714645e67e07e9c70c2cbccefa29e77c7a1df78 SHA512 c5be08f1f6d35fe1c363146a60144c7c65b6d0f7c548dd874ddea1fccb773eb37e33ac325add6d1c082c05e4dbf856247d7bb1c522a170b0dc9c7338776079d4
+DIST cvmfs-2.8.1.tar.gz 44117247 BLAKE2B 3505747833779463df79e40c03359c8458d51d2e4635ce6bc7ac080112ca4e81ca914dc6866afc28094e656acf8e3051749ec278e00b8357a50dd530fc2b65be SHA512 3ca4a45e24e06e4ea46a708b3e47fafc4c6eae172c296b091c8d0fb6b2d21c64d4b8975baf7f055101a9d68ada1e3082e7ec808da3fdaf68b5a3a3b5c4ed7731
+EBUILD cvmfs-2.7.3.ebuild 2193 BLAKE2B 7bce77878c0d3fbd134e9583fc9df65f81dc2b8e8a2189d0f37ae0a9b32f9b91aecebaac616ed1b5dba7478919c04ea15b7adce80b3606a4fed5c1968accd965 SHA512 17c890d78703eb0b94a95559f2a65d4987d6aae103260dc0153113e3f31ec3dbfbe7dcc5348b0b36fdf61ef39b744833b49b7bdc0ffab43c8cde22a7eb4b6ae3
+EBUILD cvmfs-2.8.1.ebuild 2364 BLAKE2B 1715fcccb60456e7ed47ad7e5530c06fab045c117d054fd769523471228a1b6797f42c8bf372ed8709382126b3e7ad72b64015294b0972448ed3d5c2f02a8782 SHA512 75174cc4d131908336965dcaac3b51b378cbb661aa58a2c7cc2393bb7f46249d22d2324b841d75f495e7233753a4cfbf4c8140ff668e800afe866a07899f169e
 MISC metadata.xml 1445 BLAKE2B 05a946a662c2f55cf57a50a88e698769e9e930f197880afaa8a81b51d2a6bb36c7e83061635992729c187e07463fc2914a214d7bf66279cd892835bebe971c73 SHA512 ee20a97ff26790a2cecfa28f0be7afdac3eda4a0aaade4cea4cb5d6c500d7634a2bb086dc0271189c50707deabc3c8882abfa25e959770976bf1196476b6aae9
diff --git a/net-fs/cvmfs/cvmfs-2.7.3.ebuild b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
index c9a633a1fa72..fbc3082281ac 100644
--- a/net-fs/cvmfs/cvmfs-2.7.3.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="doc server"
 
 CDEPEND="
diff --git a/net-fs/cvmfs/cvmfs-2.7.2-r1.ebuild b/net-fs/cvmfs/cvmfs-2.8.1.ebuild
index a2638ee2e932..48b4b4a11732 100644
--- a/net-fs/cvmfs/cvmfs-2.7.2-r1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc server"
+IUSE="server"
 
 CDEPEND="
 	acct-group/cvmfs
@@ -42,14 +42,12 @@ RDEPEND="${CDEPEND}
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
 "
 
 PATCHES=(
-		"${FILESDIR}"/${P}-builtins.patch
-		"${FILESDIR}"/${P}-find-package.patch
-		"${FILESDIR}"/${P}-gcc-version.patch
-		"${FILESDIR}"/${P}-xattr.patch
+		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
+		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
+		"${FILESDIR}"/${PN}-2.7.2-xattr.patch
 )
 
 pkg_setup() {
@@ -75,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
@@ -89,20 +87,13 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
 src_install() {
 	cmake_src_install
-	use bash-completion && \
-		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
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/html
-		docompress -x /usr/share/doc/${PF}/html
-	fi
+	keepdir /var/lib/cvmfs
+	use server && keepdir /var/lib/cvmfs-server
 }
 
 pkg_config() {