gentoo resync : 29.06.2021

5 files changed, 4 insertions, 64 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 1be80ca456f7..6f96dd90e186 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 136a2c90ec98..9e9e2c4dd328 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,9 +1,8 @@
 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.3.tar.gz 43123803 BLAKE2B 39d11f9dd69e36897c501bd4b24c01a13fc351d1251cd9a7965fe46ddf0c8128c3c976bb747d477d5d5231aeef09cad38337bb28c343c1d7bfbd915af02119cb SHA512 94940a09a713c14f776914b74bbec8794637b98b42ffcbab36e3455c0ea83219ae6f0eebaf41a62d1abf05134aada0abfd521dec793b2fec015458b80f387bfd
 DIST cvmfs-2.8.1.tar.gz 44117247 BLAKE2B 3505747833779463df79e40c03359c8458d51d2e4635ce6bc7ac080112ca4e81ca914dc6866afc28094e656acf8e3051749ec278e00b8357a50dd530fc2b65be SHA512 3ca4a45e24e06e4ea46a708b3e47fafc4c6eae172c296b091c8d0fb6b2d21c64d4b8975baf7f055101a9d68ada1e3082e7ec808da3fdaf68b5a3a3b5c4ed7731
-EBUILD cvmfs-2.7.3.ebuild 2193 BLAKE2B 7bce77878c0d3fbd134e9583fc9df65f81dc2b8e8a2189d0f37ae0a9b32f9b91aecebaac616ed1b5dba7478919c04ea15b7adce80b3606a4fed5c1968accd965 SHA512 17c890d78703eb0b94a95559f2a65d4987d6aae103260dc0153113e3f31ec3dbfbe7dcc5348b0b36fdf61ef39b744833b49b7bdc0ffab43c8cde22a7eb4b6ae3
-EBUILD cvmfs-2.8.1.ebuild 2364 BLAKE2B 1715fcccb60456e7ed47ad7e5530c06fab045c117d054fd769523471228a1b6797f42c8bf372ed8709382126b3e7ad72b64015294b0972448ed3d5c2f02a8782 SHA512 75174cc4d131908336965dcaac3b51b378cbb661aa58a2c7cc2393bb7f46249d22d2324b841d75f495e7233753a4cfbf4c8140ff668e800afe866a07899f169e
+EBUILD cvmfs-2.7.3.ebuild 2180 BLAKE2B 4967b1845bfc9a135fc64bf5ecf0410fa641eb08ac5ab557dae87b8cd31adaa7ebabb032b082b590125a162bba4a082fd66d13ebcb28686a18e9f2c838a906de SHA512 009048bca99ce7bca85e563bbb3b5c4879127a0cbf147f11c6a03ab610e669c80ab56e06a416b30a73c657a16c102d98fc018016222bbacf6e4841bd00d3020f
+EBUILD cvmfs-2.8.1.ebuild 2351 BLAKE2B cd500904909ae9ea91cbf56f06956570e580ae2623b9fc019003946a3f52a8ac6696fd9343b1d8ee3efc78bc83366ec81f49d0d90f2113774eef132ebeca34f3 SHA512 a55e7e2d2282430a90549e82be9bf7154360600d0e8e5fdc134b8570a56bf2382ab1000daccf80f687352e0eae98087d2e205e47499355957cb7df9343d0c1a0
 MISC metadata.xml 1445 BLAKE2B 05a946a662c2f55cf57a50a88e698769e9e930f197880afaa8a81b51d2a6bb36c7e83061635992729c187e07463fc2914a214d7bf66279cd892835bebe971c73 SHA512 ee20a97ff26790a2cecfa28f0be7afdac3eda4a0aaade4cea4cb5d6c500d7634a2bb086dc0271189c50707deabc3c8882abfa25e959770976bf1196476b6aae9
diff --git a/net-fs/cvmfs/cvmfs-2.7.3.ebuild b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
index fbc3082281ac..f52b8b8ddfe0 100644
--- a/net-fs/cvmfs/cvmfs-2.7.3.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
 SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-fs/cvmfs/cvmfs-2.8.1.ebuild b/net-fs/cvmfs/cvmfs-2.8.1.ebuild
index 48b4b4a11732..f1aa0fc16ee5 100644
--- a/net-fs/cvmfs/cvmfs-2.8.1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.8.1.ebuild
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
 SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
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
deleted file mode 100644
index ff76b5746705..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-