gentoo resync : 29.12.2022

4 files changed, 53 insertions, 1 deletions

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 4b2b92e0fbf6..ed7d98541645 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,5 +1,7 @@
 AUX bareos-20.0.2-cmake-gentoo.patch 1332 BLAKE2B b84158913e0bf051013681f8583546add34d48ea56647beb057525a0da1fff57dcd06c20dd125f300e34a42adb450c3a00456077de914dedf50b5a68748ef1ae SHA512 61e2b119d12daa60bf1fa0bc1de81d4322df421c6c5d2de4e823686f8a8657f521d53256533b52b17a105a25ef8070058144620d71aa295b491d2a39bc7de2f4
 AUX bareos-21-cmake-gentoo.patch 694 BLAKE2B a01f469c1f61a5887dd75779c96fdebf666989c9ec203d478291bb58d8ae974e624c6d83977247f47fdc9cdcae0761552a2864e31ec26cbd64317610bc87613f SHA512 225afe4c2d9ee7774d34776071b8b8430c0a4c28e8a2b301fb5f3963ae4b02ea6f6020082d4bcc0ba937728cd57f77ba19fbc176f8f14c0dc28fa98135fb3c80
+AUX bareos-21.1.2-no-automagic-ccache.patch 837 BLAKE2B 81eea4aa487c59e5514e64e26760d5eaee4b124a2a07e7dc4098adeb0d163dcaa2986c8044b5de9f681e35a8612c3e6a72e5843454e7565747daa536a3e55711 SHA512 1c3b2b9633e7436ce4f782956c9f1722057186a0537a3c4e1f8d78e1ffc8f1afa80c532a6f06ea45a301d4580bc695684a1281b544db376462b613bcb98b803b
+AUX bareos-21.1.2-werror.patch 785 BLAKE2B b29c00d57818a911251b1ca487372679140131eed7844188ea98b43f654901e88ea5a592bd77330160b2bf401bac8d9118c7989e2d44e8566e847e9625d9b0dc SHA512 b050b796e2f75192b39a7540f2d5a065b97899de2159d5fb9ca5eda19cc00cfeae392550267389c7f6f85ae9106e929117bb8a62be5106b16ad30184381cd4a6
 AUX bareos-cmake-gentoo.patch 516 BLAKE2B 685734517fc166413250782ed35445761b19efd9b7ffedb8436a71f5aea84e38633c61318c914169d3ea40daf0c45e3fe229136cdb1a98dc087cd56b91a4b1d2 SHA512 c0d89844a66f851f556e00faf42e85157c744f1547b37d95f5dd0c58a0ab62fb60a8aead87546ea37f5f9d0eb247a3e1a715d042aafe9b422a3eefe37518b743
 AUX bareos-dir-21.confd 357 BLAKE2B 819a8c4bbf66a4a629128d3b23cc122fc340eb5672e406234d1a2960c30ed075989585e1e4801b2bde8f1edeca770d80b58e58bfcaeb45fa056afab4b610b013 SHA512 9858964a291ee9849e144f968a239758e3e6905bb5420717652114d8a583e3342e50f046efa41730f30cfc3f047b485251e93085fb13b327a6f2272d7c4c0309
 AUX bareos-dir-21.initd 541 BLAKE2B 07ec7d342948da390f26a7dbc2209b351ef1f56ada775a37505bd1a0d5d241e2198fa160c1f42dd05609a4b708aca8675684846bcdc038cf1f35d6c46be26c14 SHA512 0d1e1fb9d69bd003b6c99b4c0120c14a4e8bb9c5c112649d299e672623241f98453278667e315c13a0ab0e93b1c17a3d7c2b8f59544c2d764e32c691a1986f3e
@@ -23,5 +25,5 @@ DIST bareos-20.0.6.tar.gz 13373519 BLAKE2B 5f75078cc9b82384e06ad2e4545ab26c04520
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941 SHA512 acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1
 EBUILD bareos-19.2.12.ebuild 10915 BLAKE2B a06c580993370a9a65b1669847bccad0f216f2c0b02a9d5f477292572d0ecc4162d9d1cbac1d3b6d4f24bdae0707bfeee8ec39f26fa2b71065b8da2105cca7c3 SHA512 d23bfc9efaf6ae0ed2a0fe8035083583533e23d8c20d2887b32867c8d40fb1b4a4abe03e936524de7a51a012b1941dd03a1542084b8bdb7d35c661ce73da8ad6
 EBUILD bareos-20.0.6.ebuild 11407 BLAKE2B 00a225c47f39abb02990a088a7b763c73f95aca2b98d3fd49015b7ab852b50c9a0b7455aa881f63071b4fd31676806e13ade6001d8465e41e8b88bbb83524167 SHA512 0924dd4387fcce3821dd039729e6395e142b5de067bee06219de5362fa1068238928c3e9dc243f8648e76717428d80b304acf5ad2719548dafe18b705800497d
-EBUILD bareos-21.1.2.ebuild 10641 BLAKE2B f35237f6ae0188ada30feb79cfb97c2647e46d3566c3b9be64c618c55dd2724a9096aa2c6692d94b11a4caa2c6a05804abbcc7023295bd217cbaf665d307c46c SHA512 05193fd2602274445c6dc9a428b56199f30f771ae9f5cb08629193014c0cbfee7959cdfb5432bf8799eb613f36ee55049dafcc95033fdbbd5ebdfdf9fe824b40
+EBUILD bareos-21.1.2.ebuild 10750 BLAKE2B df1d2161957fb5e4b455255fedff4b419725922ec3a402280e15dd1760ba15bd3dd338baff6d27356bc20537105eef4fbeb6c1d6322b50195dbd68025d0c714e SHA512 252a646c81647b2e9f4857d22f62dec518ceda2286f23217b237d77e2019c072cec7268ed4b66185c9300c9fe7bf360ff1acb626a751c5503677041b32f51371
 MISC metadata.xml 1117 BLAKE2B c53e52cc72764097cf0e40ba5318e044d6f0dc8d852cae9bff5e7915062d75a75fb558c8dcdfb321fb42b204de0521c826394102bb8e312d0df874b19e7052ad SHA512 f2d8ac8e4d8f880b46a9535b709d1d0b0dbccf02e0f8ae0bb97bbe3ebf139f090951ad6e9f172804045928d0ed78ea602fdd378a91645e0faf2f4717b0096578
diff --git a/app-backup/bareos/bareos-21.1.2.ebuild b/app-backup/bareos/bareos-21.1.2.ebuild
index 4baeaaf6c0ec..0b224ba4eae8 100644
--- a/app-backup/bareos/bareos-21.1.2.ebuild
+++ b/app-backup/bareos/bareos-21.1.2.ebuild
@@ -143,6 +143,8 @@ src_test() {
 src_prepare() {
 	# fix gentoo platform support
 	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
 
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
diff --git a/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch
new file mode 100644
index 000000000000..22cdc2a41c36
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch
@@ -0,0 +1,25 @@
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -44,12 +44,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common)
+ 
+ include(GNUInstallDirs)
+ 
+-find_program(CCACHE_FOUND ccache)
+-if(CCACHE_FOUND)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-endif(CCACHE_FOUND)
+-
+ # switch on CXX 17 Support
+ #
+ set(CMAKE_CXX_STANDARD 17)
+@@ -584,9 +578,6 @@ message(STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION})
+ # A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). But
+ # there are also two variables exactly for this purpose:
+ 
+-# wheter or not
+-message(STATUS "CCACHE_FOUND: " ${CCACHE_FOUND})
+-
+ # Choose the type of build.  Example: SET(CMAKE_BUILD_TYPE Debug)
+ message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
+ 
diff --git a/app-backup/bareos/files/bareos-21.1.2-werror.patch b/app-backup/bareos/files/bareos-21.1.2-werror.patch
new file mode 100644
index 000000000000..10de9f1415b6
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21.1.2-werror.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/841734
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -96,7 +96,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+     -Werror=format-security compiler_error_format_security
+   )
+   if(${compiler_error_format_security})
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security")
+   endif()
+ endif()
+ 
+@@ -353,8 +353,8 @@ if(developer)
+   add_definitions("-DDEVELOPER=1")
+ endif()
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ 
+ include(BareosSetVariableDefaults)
+ option(ENABLE_BCONSOLE "Build bconsole binary" ON)