gentoo resync : 21.06.2020

9 files changed, 349 insertions, 173 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index e3d09aa203be..f903dbce3e0c 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 1ff987f48b95..c296184cb08b 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,3 +1,7 @@
-DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b
-EBUILD cvmfs-2.3.5-r2.ebuild 3622 BLAKE2B 8cebea8aeac19c59d6edbba3cc3822ea398fd021620938e2e3478c9fcfdcd6d47d0c014f24ea62b0ed89b3fc0d026665585fad0bd37ab3a9578634636cff2b0a SHA512 edfcce5ee2e65e7f3ebc750cee0b62d3114ff8065e08a746f5a4feecfe165c9d4aa7efd3ca4f930a6e2dcd087c053211c2cba0c1d1a23350c1f69ce82c7dcb5a
-MISC metadata.xml 1385 BLAKE2B b1766d512ec47f2db5a91d80e7386c5f83fa18e6eb4b263597d7c437a6fc60954c012c1a7192281f3bdf76781b2e614f25c500250d8f09698a5264ed8b848baa SHA512 7c67b9912a6e433a3acd495064b65b0ba793c44d97d4c8a8bd546fb850875301fa1e1d14403b59e99229f016a21e64d0c1b6e6b2a7652b9bb460e2277f663649
+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-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
+EBUILD cvmfs-2.7.2.ebuild 2467 BLAKE2B 28300da1135ac5ef2320acffd0b82555a65e593f62263f0b7691f32a5a3dfa540ec8b5132c0a18de69aa3a0db7c017fe8d95817dcbe9ea1afc872c048ad2758d SHA512 9163f47f18ebe58e5aa489c3fc26ad9c5a8ee3ce398608a990cfa2a5998b8eb8cc3a9eeba7289410e61851d686f82c4cdc7b9be1791aa4c40a8c82201ce3c986
+MISC metadata.xml 1445 BLAKE2B 05a946a662c2f55cf57a50a88e698769e9e930f197880afaa8a81b51d2a6bb36c7e83061635992729c187e07463fc2914a214d7bf66279cd892835bebe971c73 SHA512 ee20a97ff26790a2cecfa28f0be7afdac3eda4a0aaade4cea4cb5d6c500d7634a2bb086dc0271189c50707deabc3c8882abfa25e959770976bf1196476b6aae9
diff --git a/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild b/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild
deleted file mode 100644
index 98352290b975..000000000000
--- a/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils linux-info bash-completion-r1
-
-MYP=${PN}-${PV/_p/-fix}
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
-SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="aufs bash-completion debug doc preload server test test-programs"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-cpp/gtest
-	>=dev-cpp/sparsehash-1.12
-	dev-db/sqlite:3=
-	dev-libs/leveldb:0=
-	dev-libs/openssl:0
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-	preload? ( >=dev-cpp/tbb-4.4:0=[debug?] )
-	server? (
-		>=dev-cpp/tbb-4.4:0=[debug?]
-		dev-python/geoip-python
-	)
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-	server? (
-		aufs? ( sys-kernel/aufs-sources )
-		www-servers/apache
-	)
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? (
-		dev-python/geoip-python
-		>=dev-cpp/tbb-4.4:0=
-		|| ( sys-devel/gdb dev-util/lldb )
-	)
-"
-
-REQUIRED_USE="test-programs? ( server )"
-
-S="${WORKDIR}/${PN}-${MYP}"
-
-pkg_setup() {
-	if use server; then
-		if use aufs; then
-			CONFIG_CHECK="~AUFS_FS"
-			ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set with the aufs flag"
-		else
-			CONFIG_CHECK="~OVERLAY_FS"
-			ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# gentoo stuff
-	sed -i -e 's/COPYING//' CMakeLists.txt || die
-	rm bootstrap.sh || die
-	sed -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		-i CMakeLists.txt || die
-
-	# hack for bundled packages
-	# not worth unbundling upstreams are flaky/dead
-	local pkg
-	for pkg in vjson sha2 sha3; do
-		# respect toolchain variables
-		sed -e 's/g++/$(CXX)/g' \
-			-e 's/gcc/$(CC)/g' \
-			-e 's/CFLAGS/MYCFLAGS/g' \
-			-e 's/-O2/$(CFLAGS)/g' \
-			-e 's/-O2/$(CXXFLAGS)/g' \
-			-e 's/ar/$(AR)/' \
-			-e 's/ranlib/$(RANLIB)/' \
-			-i externals/${pkg}/src/Makefile || die
-		mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg}
-		cp -r externals/${pkg}/src/* \
-		   "${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGEOIP_BUILTIN=OFF
-		-DGOOGLETEST_BUILTIN=OFF
-		-DLEVELDB_BUILTIN=OFF
-		-DLIBCURL_BUILTIN=OFF
-		-DPACPARSER_BUILTIN=OFF
-		-DSPARSEHASH_BUILTIN=OFF
-		-DSQLITE3_BUILTIN=OFF
-		-DTBB_PRIVATE_LIB=OFF
-		-DZLIB_BUILTIN=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=ON
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-		-DBUILD_PRELOADER="$(usex preload)"
-		-DBUILD_SERVER="$(usex server)"
-	)
-	if use test || use test-programs; then
-		mycmakeargs+=( -DBUILD_UNITTESTS=ON )
-	fi
-	use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON )
-	if use debug; then
-		mycmakeargs+=(
-			$(cmake-utils_use server BUILD_SERVER_DEBUG)
-			$(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_install() {
-	cmake-utils_src_install
-	use bash-completion && \
-		newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
-	dodoc doc/*.md
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${BUILD_DIR}"/html
-		docompress -x /usr/share/doc/${PF}/html
-	fi
-}
-
-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.7.2.ebuild b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
new file mode 100644
index 000000000000..12c569ab5c0c
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 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="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion doc server"
+
+CDEPEND="
+	app-arch/libarchive
+	dev-cpp/sparsehash
+	dev-db/sqlite:3=
+	dev-libs/leveldb: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
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-builtins.patch
+		"${FILESDIR}"/${P}-find-package.patch
+		"${FILESDIR}"/${P}-gcc-version.patch
+		"${FILESDIR}"/${P}-xattr.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=$(usex doc)
+		-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_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
+	dodoc doc/*.md
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/html
+		docompress -x /usr/share/doc/${PF}/html
+	fi
+}
+
+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.7.2-builtins.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
new file mode 100644
index 000000000000..cbc723a7fd70
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
@@ -0,0 +1,95 @@
+From 966d98be2d2d6169a29c22eb5565f34fad1c0fb9 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <guilherme@amadio.org>
+Date: Mon, 6 Apr 2020 17:19:19 +0200
+Subject: [PATCH 2/3] Build some externals as part of the regular build
+
+---
+ CMakeLists.txt                     |  9 ++++++---
+ externals/sha2/src/CMakeLists.txt  |  8 ++++++++
+ externals/sha3/src/CMakeLists.txt  | 14 ++++++++++++++
+ externals/vjson/src/CMakeLists.txt |  8 ++++++++
+ 4 files changed, 36 insertions(+), 3 deletions(-)
+ create mode 100644 externals/sha2/src/CMakeLists.txt
+ create mode 100644 externals/sha3/src/CMakeLists.txt
+ create mode 100644 externals/vjson/src/CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a50b603fe..3403ae67b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -320,7 +320,8 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ find_package (GMock REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
+ 
+-find_package (VJSON REQUIRED)
++#find_package (VJSON REQUIRED)
++add_subdirectory(externals/vjson/src)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS})
+ 
+ find_package (LibArchive REQUIRED)
+@@ -333,10 +334,12 @@ if (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
+   find_package (ZLIB REQUIRED)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS})
+ 
+-  find_package (SHA2 REQUIRED)
++  #find_package (SHA2 REQUIRED)
++  add_subdirectory(externals/sha2/src)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA2_INCLUDE_DIRS})
+ 
+-  find_package (SHA3 REQUIRED)
++  # find_package (SHA3 REQUIRED)
++  add_subdirectory(externals/sha3/src)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS})
+ endif (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
+        BUILD_UNITTESTS OR BUILD_UNITTESTS_DEBUG OR BUILD_PRELOADER OR
+diff --git a/externals/sha2/src/CMakeLists.txt b/externals/sha2/src/CMakeLists.txt
+new file mode 100644
+index 000000000..091e1ed6b
+--- /dev/null
++++ b/externals/sha2/src/CMakeLists.txt
+@@ -0,0 +1,8 @@
++project(SHA2)
++
++add_library(cvmfs_sha2 STATIC sha2.c)
++set_property(TARGET cvmfs_sha2 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_sha2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
++
++set(SHA2_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
++set(SHA2_LIBRARIES cvmfs_sha2 PARENT_SCOPE)
+diff --git a/externals/sha3/src/CMakeLists.txt b/externals/sha3/src/CMakeLists.txt
+new file mode 100644
+index 000000000..15db012d4
+--- /dev/null
++++ b/externals/sha3/src/CMakeLists.txt
+@@ -0,0 +1,14 @@
++project(SHA3)
++
++add_library(cvmfs_sha3 STATIC #GLOBAL
++  64opt/KeccakF-1600-opt64.c
++  KeccakHash.c
++  KeccakSponge.c
++  SnP-FBWL-default.c
++  )
++
++set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_sha3 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt)
++
++set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt PARENT_SCOPE)
++set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE)
+diff --git a/externals/vjson/src/CMakeLists.txt b/externals/vjson/src/CMakeLists.txt
+new file mode 100644
+index 000000000..316ab7617
+--- /dev/null
++++ b/externals/vjson/src/CMakeLists.txt
+@@ -0,0 +1,8 @@
++project(VJSON)
++
++add_library(cvmfs_vjson STATIC block_allocator.cpp json.cpp)
++set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_vjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
++
++set(VJSON_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
++set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE)
+-- 
+2.26.0
+
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
new file mode 100644
index 000000000000..ce4b85f7921f
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
@@ -0,0 +1,41 @@
+From 3a4881d1dc211ec358995d6d8501818beedc62ac Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <guilherme@amadio.org>
+Date: Mon, 6 Apr 2020 17:26:48 +0200
+Subject: [PATCH 3/3] Comment out unnecessary package lookups
+
+---
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3403ae67b..2895b567a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -295,7 +295,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CMAKE_BINARY_DIR})
+ # set properties for configurable libraries
+ #
+ 
+-find_package (Valgrind)
++# find_package (Valgrind)
+ if (VALGRIND_FOUND)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VALGRIND_INCLUDE_DIR})
+   add_definitions(-DHAS_VALGRIND_HEADERS)
+@@ -314,11 +314,11 @@ endif (NOT MACOSX)
+ find_package (OpenSSL REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR})
+ 
+-find_package (GTest REQUIRED)
+-set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
++# find_package (GTest REQUIRED)
++# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ 
+-find_package (GMock REQUIRED)
+-set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
++# find_package (GMock REQUIRED)
++# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
+ 
+ #find_package (VJSON REQUIRED)
+ add_subdirectory(externals/vjson/src)
+-- 
+2.26.0
+
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
new file mode 100644
index 000000000000..ff76b5746705
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
@@ -0,0 +1,59 @@
+From cdeb988a7ece84191ec3496d55b99d82ca9face5 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Fri, 19 Jun 2020 11:19:14 +0200
+Subject: [PATCH] Remove broken version checks which fail for GCC 10
+
+---
+ cmake/Modules/cvmfs_compiler.cmake | 27 +++------------------------
+ 1 file changed, 3 insertions(+), 24 deletions(-)
+
+diff --git a/cmake/Modules/cvmfs_compiler.cmake b/cmake/Modules/cvmfs_compiler.cmake
+index 2560d231c..e473467b3 100644
+--- a/cmake/Modules/cvmfs_compiler.cmake
++++ b/cmake/Modules/cvmfs_compiler.cmake
+@@ -35,33 +35,12 @@ set (ENV{LDFLAGS}    "${LDFLAGS}")
+ #
+ set (CVMFS_FIX_FLAGS "")
+ set (CVMFS_OPT_FLAGS "-Os")
+-if (CMAKE_COMPILER_IS_GNUCC)
+-  message (STATUS "checking gcc version...")
+-  execute_process (
+-    COMMAND ${CMAKE_C_COMPILER} -v
+-    OUTPUT_VARIABLE CVMFS_GCC_VERSION
+-    ERROR_VARIABLE  CVMFS_GCC_VERSION
+-  )
+-  STRING(REGEX REPLACE ".*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CVMFS_GCC_MAJOR "${CVMFS_GCC_VERSION}")
+-  STRING(REGEX REPLACE ".*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" CVMFS_GCC_MINOR "${CVMFS_GCC_VERSION}")
+-  if (${CVMFS_GCC_MAJOR} LESS 4)
+-    message (FATAL_ERROR "GCC < 4.1 unsupported")
+-  endif (${CVMFS_GCC_MAJOR} LESS 4)
+-  if (${CVMFS_GCC_MAJOR} EQUAL 4)
+-    if (${CVMFS_GCC_MINOR} LESS 2)
+-      set (CVMFS_OPT_FLAGS "-O1")
+-    endif (${CVMFS_GCC_MINOR} LESS 2)
+-  endif (${CVMFS_GCC_MAJOR} EQUAL 4)
+-  if (${CVMFS_GCC_MAJOR} GREATER 6)
+-    set (CVMFS_FIX_FLAGS "-Wno-format-truncation")
+-  endif (${CVMFS_GCC_MAJOR} GREATER 6)
+-endif (CMAKE_COMPILER_IS_GNUCC)
+ message (STATUS "using compiler opt flag ${CVMFS_OPT_FLAGS}")
+ set (CVMFS_BASE_C_FLAGS "${CVMFS_OPT_FLAGS} -g -fno-strict-aliasing -fasynchronous-unwind-tables -fno-omit-frame-pointer -fwrapv -fvisibility=hidden -Wall ${CVMFS_FIX_FLAGS}")
+ if (APPLE)
+-  if (${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
++  if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
+     set(CVMFS_BASE_C_FLAGS "${CVMFS_BASE_C_FLAGS} -mmacosx-version-min=10.11")
+-  endif(${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
++  endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
+ endif(APPLE)
+ set (CVMFS_BASE_CXX_FLAGS "${CVMFS_BASE_C_FLAGS} -fno-exceptions")
+ if (NOT USING_CLANG)
+@@ -94,4 +73,4 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     message("Enable inotify support")
+     set(CVMFS_ENABLE_INOTIFY ON)
+   endif(HAS_INOTIFY_INIT1)
+-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+\ No newline at end of file
++endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-- 
+2.27.0
+
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
new file mode 100644
index 000000000000..e10557923ced
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
@@ -0,0 +1,26 @@
+From 44cae128f7478ab81be92cdfc7dec6c2aee26e42 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <guilherme@amadio.org>
+Date: Mon, 6 Apr 2020 17:17:30 +0200
+Subject: [PATCH 1/3] Do not include deprecated attr/xattr.h
+
+---
+ cvmfs/platform_linux.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/cvmfs/platform_linux.h b/cvmfs/platform_linux.h
+index 21e7d81fb..9aa0c9051 100644
+--- a/cvmfs/platform_linux.h
++++ b/cvmfs/platform_linux.h
+@@ -9,9 +9,6 @@
+ 
+ #include <sys/types.h>  // contains ssize_t needed inside <attr/xattr.h>
+ #include <sys/xattr.h>
+-#ifdef HAVE_ATTR_XATTR_H
+-#include <attr/xattr.h>  // NOLINT(build/include_alpha)
+-#endif
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-- 
+2.26.0
+
diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml
index e05f7bafa0ae..6d58ea9a03ae 100644
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@@ -10,21 +10,20 @@
     <name>Mikle Kolyada</name>
   </maintainer>
   <longdescription lang="en">
-  The CernVM File System is a client-server file system developed to
-  deliver software stacks onto virtual machines in a fast, scalable,
-  and reliable way. CernVM-FS is implemented as a FUSE module. It
-  makes a specially prepared directory tree stored on a web server
-  look like a local read-only file system on the virtual
-  machine. CernVM-FS uses outgoing HTTP connections only, thereby it
-  avoids most of the firewall issues of other network file systems. It
-  transfers data file by file on demand, verifying the content by
-  SHA-1 keys.
+  The CernVM-File System (CernVM-FS) provides a scalable, reliable and low-
+  maintenance software distribution service. It was developed to assist High
+  Energy Physics (HEP) collaborations to deploy software on the worldwide-
+  distributed computing infrastructure used to run data processing applications.
+  CernVM-FS is implemented as a POSIX read-only file system in user space (a
+  FUSE module). Files and directories are hosted on standard web servers and
+  mounted in the universal namespace /cvmfs. Internally, CernVM-FS uses content-
+  addressable storage and Merkle trees in order to maintain file data and
+  meta-data. CernVM-FS uses outgoing HTTP connections only, thereby it avoids
+  most of the firewall issues of other network file systems. It transfers data
+  and meta-data on demand and verifies data integrity by cryptographic hashes.
   </longdescription>
   <use>
-    <flag name="aufs">Use AUFS instead of OverlayFS for the server</flag>    
-    <flag name="preload">Install the cvmfs cache preloader for distributed file systems</flag>    
     <flag name="server">Install the cvmfsd program and init script</flag>
-    <flag name="test-programs">Install unit test programs</flag>    
   </use>
   <upstream>
     <remote-id type="github">cvmfs/cvmfs</remote-id>