gentoo auto-resync : 19:09:2022 - 17:22:11

6 files changed, 18 insertions, 111 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index c80597e6bb61..83bdf300b837 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index ce980539c712..334f0142fe51 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,10 +1,9 @@
 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.8.2.tar.gz 44130007 BLAKE2B 3c15c3549971deb418ee142bbec0db8ae272d0fe5371e618460e31bd2c083ff1d1c00e5bc3520b199fdf3297cad278185617f51a217f75120dd71ea792a7a8a8 SHA512 a3a1a6d4eb36248744145393d6ebe5015f8f1d4506bb9adca13b19f68a2e57cdf77fc0e7202ff4e8a927bff3a6e1808f9c740755145b860f2915a31ec9dd5fa3
-DIST cvmfs-2.9.0.tar.gz 48042721 BLAKE2B 614fcacbcc142c22f871e511db951c826245651ce29760f05c132dffc7920c1232c96a51a70d65cae6f48d8e6564d4ed3a30b4c460dce0b37ad24994571b32f1 SHA512 9ff5ba0ff2fe917403e9f7a5139c28c861e95a93d96bf8ff5a7fb7f36dca3b8ddf0d8b2763396a70950f98b032d34d6c0f1ea093e53bf950c5370c933abc22b5
+AUX cvmfs-2.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa535ee469ce6b3967bc9cff4743eac9e923c6a4cde74cbd7e988aff70022fc151f7745230d7517d09060e8d62f2bfef91 SHA512 1518dee2b016b5c7bf8c99e0f86a5da87d5dcd37a3d25f6dfb5afc0906ea41e67747dd37360a7e6da8557f8e4aa8587c317a4f105c4954b227aeb28190524ef9
 DIST cvmfs-2.9.2.tar.gz 70806074 BLAKE2B aeb7a246331e2e8453285582934e4da337ff6730f5b826db907b76773968b89138e9e7cc43d7422b5e7588e81b97e7dc0c0f5ea03e6bde89d55297cbab75f70c SHA512 7742678a227a22a8e17bbdba21e68b0e188ccae8e483906cae005d15ff465f60b407f5fc29183b0272ca9572c3512ffc9596b4c9dda764e6adf5edcec97d4547
-EBUILD cvmfs-2.8.2.ebuild 2355 BLAKE2B 60906c1308e5bb14cd9c1b627aec0cc415ced4cc6ea9dcd13a1d99524b12cb8f9a43f15a7d9447ba33b4b61a1acdea4dfbfbe11b98fe611e986f546eac973ba2 SHA512 970dad2341d351890962ca2403051492fa394d068dc79dc1f5231a0a8cfdc6b1fff25e51f129ffaf0003680e4ff940332ec1c1994588dc73a3bf78bba3121c1d
-EBUILD cvmfs-2.9.0.ebuild 2315 BLAKE2B 790216ab6dad279138b99f4d84e1cb571ceb6c7978629119fc63255ff80243cf3f468fc168eaa87de0b0124cf096928265b747236aa9872865335aca709a0813 SHA512 6d73e90f73a4d9888711e08f81c597f923ccad59a57aaa57be68aae9a6e2d08c432e671be84f1500f138360a9edfb21176ab5bf02b78417582de7ceed898f0c5
-EBUILD cvmfs-2.9.2.ebuild 2317 BLAKE2B cc896037da2d6ef56ffe1f98ae5554c10a05f7ece066b44be7e36d2e15dab0bd8259990f99890af15b2659236ee8916152e458b6a96ae3e331c875e8d8957846 SHA512 05ac21b52ecb45aa2cb5eea602966e180eb226724de1462910c0fc9c3b25f5c4a893fbcbab0d2e0512005303ac767e5cfa944ef924212060a54e77c25de9ec40
+DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
+EBUILD cvmfs-2.9.2.ebuild 2363 BLAKE2B 8bb21a5aebe78cdc4235d846750247c09a7b15561bf952e10e03d9ba5c6d06c3b1732f73256cbe1ca56b3473a70267352752d7de2704f9ec0c65b2c06c9c44c0 SHA512 3c7da2d9dee7910795db22ea0ceb3d593bae9284e584020d2ef05923b524dbe16ef718ba1edddab2cbb4cf5951d48cdb8485f22748b5c58890376bfe42bf4465
+EBUILD cvmfs-2.9.4.ebuild 2365 BLAKE2B f6cfca7805904244b48c873062b2358656e8ca75aeaf14b588d5f18941c8cd9d8538264e94cd152db8fea38d1b3bbd816d1970c2447d555abb0c0148baaf894c SHA512 fd61d4a3d84834b3e42c1ae99c33f5f1300dbd050dfc644468a6744170f15b1536573ce211725d1a5d4e75142c21c99a06ed285d426d3f5f97025627d924a4dc
 MISC metadata.xml 1446 BLAKE2B 17b4b0170f3aa7e4ebbdc7d2bbd1b851a6e11b08338ecd9e441dc98a37b9dc5b9b952ef57b367b7e5991a7008f893fda2289c2e391fe8b3ceca112203b02ad00 SHA512 3e759f757e392a13efec745e56a1edabe32ca1c64372ba41b3919f312a81f2e1cb486009baec38704325d466731782d44edd447dfee28607eee9ac75924ac97e
diff --git a/net-fs/cvmfs/cvmfs-2.9.0.ebuild b/net-fs/cvmfs/cvmfs-2.9.0.ebuild
deleted file mode 100644
index 882990fbe998..000000000000
--- a/net-fs/cvmfs/cvmfs-2.9.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="https://cernvm.cern.ch/fs/"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="server"
-
-CDEPEND="
-	acct-group/cvmfs
-	acct-user/cvmfs
-	app-arch/libarchive
-	dev-cpp/gtest
-	dev-cpp/sparsehash
-	dev-db/sqlite:3=
-	<dev-libs/leveldb-1.23:0=
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-fs/fuse:3=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
-		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
-)
-
-pkg_setup() {
-	if use server; then
-		CONFIG_CHECK="~OVERLAY_FS"
-		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# gentoo stuff
-	rm bootstrap.sh || die
-	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
-	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		CMakeLists.txt || die
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILTIN_EXTERNALS=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-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
-		-DBUILD_RECEIVER=OFF # for distributed publishers only
-		-DBUILD_SERVER=$(usex server)
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	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() {
-	einfo "Setting up CernVM-FS client"
-	cvmfs_config setup
-	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
-	einfo "and restart the autofs service"
-}
diff --git a/net-fs/cvmfs/cvmfs-2.9.2.ebuild b/net-fs/cvmfs/cvmfs-2.9.2.ebuild
index ef6cde5e9e1b..a6349928b3c2 100644
--- a/net-fs/cvmfs/cvmfs-2.9.2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.9.2.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="
@@ -47,6 +47,7 @@ DEPEND="${CDEPEND}
 PATCHES=(
 		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
 		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
+		"${FILESDIR}"/${PN}-2.9.2-include-ctime.patch
 )
 
 pkg_setup() {
diff --git a/net-fs/cvmfs/cvmfs-2.8.2.ebuild b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
index 4e8078c1e5d7..ed1428a69031 100644
--- a/net-fs/cvmfs/cvmfs-2.8.2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.9.4.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="
@@ -47,7 +47,7 @@ DEPEND="${CDEPEND}
 PATCHES=(
 		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
 		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
-		"${FILESDIR}"/${PN}-2.7.2-xattr.patch
+		"${FILESDIR}"/${PN}-2.9.2-include-ctime.patch
 )
 
 pkg_setup() {
diff --git a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
new file mode 100644
index 000000000000..0dd97cc1f709
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
@@ -0,0 +1,10 @@
+--- a/cvmfs/authz/helper_log.cc	2022-07-04 12:15:08.000000000 +0200
++++ b/cvmfs/authz/helper_log.cc	2022-09-01 17:55:08.200175687 +0200
+@@ -8,6 +8,7 @@
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <ctime>
+ 
+ #include <cassert>
+ #include <cstdarg>