3 files changed, 115 insertions, 0 deletions
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 3ed0d0d9b144..8f4bf1677804 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1 +1,2 @@
 DIST cvmfs-2.9.2.tar.gz 70806074 BLAKE2B aeb7a246331e2e8453285582934e4da337ff6730f5b826db907b76773968b89138e9e7cc43d7422b5e7588e81b97e7dc0c0f5ea03e6bde89d55297cbab75f70c SHA512 7742678a227a22a8e17bbdba21e68b0e188ccae8e483906cae005d15ff465f60b407f5fc29183b0272ca9572c3512ffc9596b4c9dda764e6adf5edcec97d4547
+DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
diff --git a/net-fs/cvmfs/cvmfs-2.9.4.ebuild b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
new file mode 100644
index 000000000000..ed1428a69031
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
@@ -0,0 +1,104 @@
+# 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
+		"${FILESDIR}"/${PN}-2.9.2-include-ctime.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/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>