From f50d60b8eb707b56133e594376e993b98e726b5d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Mar 2024 18:45:26 +0000 Subject: gentoo auto-resync : 10:03:2024 - 18:45:26 --- net-fs/Manifest.gz | Bin 3359 -> 3358 bytes net-fs/cvmfs/Manifest | 4 +- net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild | 102 ------------------------------------ net-fs/cvmfs/cvmfs-2.11.2.ebuild | 9 ++-- 4 files changed, 6 insertions(+), 109 deletions(-) delete mode 100644 net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild (limited to 'net-fs') diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index 24c299696b85..f6caadad25b5 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index 66a784069fc9..d37d584b6e74 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1,6 +1,4 @@ AUX cvmfs-2.10.1-gentoo.patch 2835 BLAKE2B c87f24fece387faa48fa1f7ae46be6c0a8eb93ec2460a45abce26d1646948a9b0f606b4b174ef3a3fb1a36387dec943f2cae4f10bf4fa9aa825ba0d732e3ff71 SHA512 93e8e94da4cce7be896afd483a372bb164a803dea9cb035bdb5bfdce2089c250b2f6d857d1ac5d9769a0c53388f457adc5e215ce21bc1040d4cb269cc66262c9 -DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f DIST cvmfs-2.11.2.tar.gz 76020587 BLAKE2B cb225647cf95c93c14a9a0dd7824aac14641f11ee1375c53fac3d5f5e8d29a1173521f82f3cbe18064c8a990ccefbf159c04e1b3d55db0599ec609d5e96391bb SHA512 c8070a10771e28d45a761fdb9083ecd15118bca02328227ca0516edcf3d14e7b338df2a4bb14edd2aa8cc20f3fc903be775fcc40ae80a7f5547340e55fa43211 -EBUILD cvmfs-2.10.1-r1.ebuild 2261 BLAKE2B 09bbaf4ce04acfad64af5077cbb9f5bb849a9884e8bcdc90051ab25e8f46a8e859e86c2748a74c2360db93bb76d987d06b4472ddba740d53cd7c47e4d434950e SHA512 04b231737bd6a867d2765821052c2d5010a3490259775d87a1e99ac85d60807b6d10a7cfe07bee77e9a932e6af737d0e4a2127b96349f1410f6deeb546e98e7c -EBUILD cvmfs-2.11.2.ebuild 2263 BLAKE2B 2a9c8646c273e1e5dfa509f1951845049438c033be70979d73a2a0a5d715b019cf047526ae77e615644587a8159518705c7f048c49e41813a2cddc0d5cd9c68f SHA512 b70b484ba6eaef650f4e893b845343be9358dba24472f36387f38960fe0fbc342b07822e81b0fa384c3d2af3d18b5daf4e963b450cc45bedd5c0204896de64a3 +EBUILD cvmfs-2.11.2.ebuild 2300 BLAKE2B df5245274f2e64bac8031915a41f15862fcb3892f27f93e9cc1be219c4d08879fe1fc93c1d995a1205b9f4b77fd94433465323760d3e27568c17189a0f97c210 SHA512 2cc7811111139adac1b45acc3c2a984ebcc26a5fc58f6fc1843ea10f0c63cc205b2239d37400bacb6c170d415a726a7b96ee2b950608e29cabe70aeba29afce4 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7 diff --git a/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild b/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild deleted file mode 100644 index fe29fb39c811..000000000000 --- a/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild +++ /dev/null @@ -1,102 +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.10.1-gentoo.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.11.2.ebuild b/net-fs/cvmfs/cvmfs-2.11.2.ebuild index 37a64e0069e1..1bfc46cba0b0 100644 --- a/net-fs/cvmfs/cvmfs-2.11.2.ebuild +++ b/net-fs/cvmfs/cvmfs-2.11.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake linux-info bash-completion-r1 @@ -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=" @@ -60,7 +60,8 @@ 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:/usr/bin/systemctl:/bin/systemctl:g" \ + -e "s:/bin/pidof:/usr/bin/pidof:g" cvmfs/cvmfs_config || die sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ CMakeLists.txt || die eapply_user -- cgit v1.2.3