gentoo auto-resync : 16:05:2023 - 22:07:44

8 files changed, 2 insertions, 257 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 9ab263611b22..8650e3362fa2 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index 18c90a76f71d..f4653080fb94 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,3 +1,3 @@
 DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c
-EBUILD btfs-2.24.ebuild 825 BLAKE2B 631cd6783a180267807dac5beaeb635d4420dd3c7c3f3176ae2d75bfef290cc9c978fd1b9eec2d53345a5047a72a2c79276223bbbf174539169de1343ed6af0e SHA512 3988c1f23ac63632d242eea0831d2181dd9a526f356a3a3d6819e1e8fa7fcade90814ba3c30369074c7adae7b194b8b482fcfeced76df87ac8d8ec73d9f077d1
+EBUILD btfs-2.24.ebuild 832 BLAKE2B 6eed3a5c8ba9b2961fb31d4ad1c526515745362d9020d27e93c21adc8a0dfd6cf4f5aa8f671174f76555e3d2607afa91e8f4f6ef7c468506c033b083bf68cca2 SHA512 7bf99e1b46e81aba56f3714f7649c132aeb98a5b532e9be2be1c9676d17377c6d68a88ad3206343fea0fa7b5e67637e05ac2a093bf2a72ee1314adf6204e5d37
 MISC metadata.xml 244 BLAKE2B 9f54ce24ff94456bd875b5386abf16c27313f10ba739afc1fc817f65fbf530a6562c2fc32caec6f1a976abab2715b98b674e167f23189653846fbb1f7352af5a SHA512 d3ddeeb221e464dfeb68c3ad361277c3711b9c1639246423454393c3158a6aae80757333d97698e938609fb21ef51f15fe1e8ecc6ebe7355c7a418df44f765c1
diff --git a/net-fs/btfs/btfs-2.24.ebuild b/net-fs/btfs/btfs-2.24.ebuild
index efc0134c4d71..38bd3d6bbeba 100644
--- a/net-fs/btfs/btfs-2.24.ebuild
+++ b/net-fs/btfs/btfs-2.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=">=sys-fs/fuse-2.8.0:0
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index b564b445fea7..8b29ea247c04 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,9 +1,4 @@
 AUX cvmfs-2.10.1-gentoo.patch 2835 BLAKE2B c87f24fece387faa48fa1f7ae46be6c0a8eb93ec2460a45abce26d1646948a9b0f606b4b174ef3a3fb1a36387dec943f2cae4f10bf4fa9aa825ba0d732e3ff71 SHA512 93e8e94da4cce7be896afd483a372bb164a803dea9cb035bdb5bfdce2089c250b2f6d857d1ac5d9769a0c53388f457adc5e215ce21bc1040d4cb269cc66262c9
-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.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa535ee469ce6b3967bc9cff4743eac9e923c6a4cde74cbd7e988aff70022fc151f7745230d7517d09060e8d62f2bfef91 SHA512 1518dee2b016b5c7bf8c99e0f86a5da87d5dcd37a3d25f6dfb5afc0906ea41e67747dd37360a7e6da8557f8e4aa8587c317a4f105c4954b227aeb28190524ef9
 DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f
-DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
 EBUILD cvmfs-2.10.1-r1.ebuild 2261 BLAKE2B 09bbaf4ce04acfad64af5077cbb9f5bb849a9884e8bcdc90051ab25e8f46a8e859e86c2748a74c2360db93bb76d987d06b4472ddba740d53cd7c47e4d434950e SHA512 04b231737bd6a867d2765821052c2d5010a3490259775d87a1e99ac85d60807b6d10a7cfe07bee77e9a932e6af737d0e4a2127b96349f1410f6deeb546e98e7c
-EBUILD cvmfs-2.9.4-r1.ebuild 2357 BLAKE2B 5fd703167dd471b6272be4ffed10f59a178d0cd56243a327217599b5278ad48ff9c36c36c31237b47830832a953f79de6bb0ec0a3f3ceaec3ef49df78022ae0f SHA512 a2c4345091b801f861b5d864cd4975953f0e9d65fb1abfb2074f09fe71042ffcbf7e5b58d2b7ae82b80bea2115f05ec28b58df026eba92728a3cd3e6d8c5625e
 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7
diff --git a/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild b/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild
deleted file mode 100644
index ea5bad4096f5..000000000000
--- a/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 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: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.7.2-builtins.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
deleted file mode 100644
index cbc723a7fd70..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index ce4b85f7921f..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.9.2-include-ctime.patch b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
deleted file mode 100644
index 0dd97cc1f709..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>