gentoo resync : 25.09.2021

4 files changed, 9 insertions, 8 deletions

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 990214889f27..16c69faf8bb5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -12,10 +12,10 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c
 AUX bareos-sd.initd 855 BLAKE2B 40ca8e89b63e67f6fa4a4f60e735bd101ce0b1ad46be07b6df2d1524cd3f3e1f2540ce4b90095168499cab82306ed3d2d1c306c2b185e22632cbd5d18c6e8f4b SHA512 d45c33374da46e53b5828b4575087d00753f4aea3af6b641933f456f2bf5ba254894fc1fc1a6641ab6ae1c3f85bcd606500d6207e23a7070c78fd4e6aa666543
 AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646eacdf31271a0cafd63e88ac463b1d94143ccac96c289de3f88a177edab665f073e7c7692037ffedb68 SHA512 6a0fdb3af03e9f94e0d755a3286aff36b41ab1f00a82e9864f6d3de6931691f6aba79aeb7fc952cec039e4174b545f53c23e96fcfbaed71192877d201b3086ad
 AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef
-DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096 SHA512 2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
-DIST bareos-19.2.10.tar.gz 12893797 BLAKE2B 49493acab4fbd26a4ef9aa2f9c19df8a535460596d8206a4d15fedeaace420b7ba948505d7b74ef65aeb94bb8bfa77cf392babeb3e6509839ac418d935fa7070 SHA512 946b1dc5709696363d2ffa3d890fa662976690723ab8054d827c930f27757a22af44b83915ce2a4f198a7d0c2a71bb19b4597141afd31b9809bd6b214237d475
-DIST bareos-20.0.2.tar.gz 13333946 BLAKE2B f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536 SHA512 f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994
-EBUILD bareos-18.2.10-r2.ebuild 11166 BLAKE2B 0ea402d3feb5ee0d88d9b3743bedd1145c9a199b637f97144543ed60da5cb87a76e35be077002f323ab9dccbb79ee2978197fcba5d91bb067d2fd45eda7b1ff9 SHA512 ac89c1c9830743210c9a83fa6b7afbd67c8bfeec8a2002394fd4bd4f68695b75b21a64d96bf0ca91798b38612c339b9a4da0593c964310ea9ff5693256cd08e6
-EBUILD bareos-19.2.10-r2.ebuild 10913 BLAKE2B 53f53486f4a38da837dc2a611468bf4cc8539b6c98bfa4c8f7de35567a0e18e3e8aae666a44e094735ff7a1d41b7ebd27df97b7004a0b2489b6ac5d0d604c038 SHA512 4deece9d0a99038ae170f9a3187cbfd660ac87d61e48b062f249cba4ea3588569d5cbe8624ffde60f2f649b395d67595e25b69b7c5e207bad418cf40862bc648
-EBUILD bareos-20.0.2-r2.ebuild 11368 BLAKE2B 631d15f7125a5aad10400f76bbc080fd451fa5b28992aa0bcc79223bcdc3ca9e2c7a2e206ff035d078cd607dd59dbf0796ad783fcd9f1036d26c63b6c221cb55 SHA512 5a90972b274d08f102d9a2892f2630828c25e16c732942b93385f6db7ffe6d97e54dae3b9472e82661ae7e4fcdc4f35238c2ee5a83c51b78c8277ca0a0331820
+DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015 SHA512 1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
+DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0 SHA512 46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
+DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
+EBUILD bareos-18.2.12.ebuild 11166 BLAKE2B 0ea402d3feb5ee0d88d9b3743bedd1145c9a199b637f97144543ed60da5cb87a76e35be077002f323ab9dccbb79ee2978197fcba5d91bb067d2fd45eda7b1ff9 SHA512 ac89c1c9830743210c9a83fa6b7afbd67c8bfeec8a2002394fd4bd4f68695b75b21a64d96bf0ca91798b38612c339b9a4da0593c964310ea9ff5693256cd08e6
+EBUILD bareos-19.2.11.ebuild 10913 BLAKE2B 53f53486f4a38da837dc2a611468bf4cc8539b6c98bfa4c8f7de35567a0e18e3e8aae666a44e094735ff7a1d41b7ebd27df97b7004a0b2489b6ac5d0d604c038 SHA512 4deece9d0a99038ae170f9a3187cbfd660ac87d61e48b062f249cba4ea3588569d5cbe8624ffde60f2f649b395d67595e25b69b7c5e207bad418cf40862bc648
+EBUILD bareos-20.0.3.ebuild 11418 BLAKE2B 70dd2c423d7857a6836ae2ac1c12983e69a50dd3f2a5370c0190fb025a7d147ab32ebaced6639b681bbddd4472fffd89eeda903b4589c020ebe1b5600919e321 SHA512 ffa4ef23c32fcf36c2b42e541cf2916feab55022205abcd6a79bf6d1d0f6e6257577f55ee40364c95c533f5234a4364fb679850245f59c551c6a0c4b898c1ed5
 MISC metadata.xml 1552 BLAKE2B 27a6ee8fad25a63be91e5bc712ffb293174c6bfca8df772be3821932baafe510b1fa271b2e36a22a11296c7a7bd23049b86dc9cbcbe2f7f30409a1e7c7b55042 SHA512 40b549c30e36a495a434c607467efa914aec228d886ee8560e77b39e4d6d6396ebae5e4a5cbdfd01b6828011ee9922112ab0041d9a9aa944d68417114b14ef53
diff --git a/app-backup/bareos/bareos-18.2.10-r2.ebuild b/app-backup/bareos/bareos-18.2.12.ebuild
index 996c4c35ce13..996c4c35ce13 100644
--- a/app-backup/bareos/bareos-18.2.10-r2.ebuild
+++ b/app-backup/bareos/bareos-18.2.12.ebuild
diff --git a/app-backup/bareos/bareos-19.2.10-r2.ebuild b/app-backup/bareos/bareos-19.2.11.ebuild
index a9e76afe1016..a9e76afe1016 100644
--- a/app-backup/bareos/bareos-19.2.10-r2.ebuild
+++ b/app-backup/bareos/bareos-19.2.11.ebuild
diff --git a/app-backup/bareos/bareos-20.0.2-r2.ebuild b/app-backup/bareos/bareos-20.0.3.ebuild
index 0e4e0741a3cb..261eb0feb129 100644
--- a/app-backup/bareos/bareos-20.0.2-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.3.ebuild
@@ -92,7 +92,7 @@ src_prepare() {
 	popd >&/dev/null || die
 
 	# fix gentoo platform support
-	eapply -p1 "${FILESDIR}/${P}-cmake-gentoo.patch"
+	eapply -p1 "${FILESDIR}/${PN}-20.0.2-cmake-gentoo.patch"
 
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
@@ -194,8 +194,9 @@ src_install() {
 	# remove upstream init scripts and systemd units
 	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
 
-	# remove misc stuffwe do not need in production
+	# remove misc stuff we do not need in production
 	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
 
 	# get rid of py2 stuff if USE=-vmware
 	if ! use vmware; then