gentoo auto-resync : 23:06:2024 - 00:11:30

5 files changed, 25 insertions, 42 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index f14edff4e9c0..74963ebad2b5 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index fdf1758bc4cd..2cf0cb2bc4f4 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -2,7 +2,6 @@ AUX bareos-21-cmake-gentoo.patch 694 BLAKE2B a01f469c1f61a5887dd75779c96fdebf666
 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-22.0.2-werror.patch 945 BLAKE2B 54234731ec69337b89ff23e6f613f0fe9fafec5ff2b3b5bf2b121a33a49fd462890c877eb9c96f1e4d26507cf22f1c3ba58c9d6dec740e8b8bd13c518a070308 SHA512 a18159d42cb464cb573a5b9b6f008f323ed45b489dd1db3f6fd22ae0fa6ef40779118834d8f3f640bc6301ee55060c7b86c2b6f2d08dd7cf141ae9e0206e9db8
-AUX bareos-22.1.2-include-algorithm.patch 1087 BLAKE2B 97938a34dd098e69c24e74a561ca191e184c1c9932b482596625ea96862446598c414420186ffd033d6541da3a0237d0a4600f1c303e4e37d4c4f5e8e4a00c3e SHA512 51c677684e14fd3d7f02d849faaa49d0ec85073789d1d34169a5b3d61115fa74ca8d5fe051cd414ed684d9187a308a4c8d22dcd0b4dfac17128fbfa4b28bf110
 AUX bareos-dir-21-r1.initd 362 BLAKE2B ed28503db1f91f41f97cc0f9bf83c9f7686a79c6945e82577b7f290df516b6e7ac403023e3aab8c86ef67f67cb3a99bd699fb2d1d0534d53d164c0143cef0e2d SHA512 fc2f217020206ff43238444910555338133370fe423959ca1b5ed53704d371db9993b3a42fe5d9c2065b12ba5a853f6f216ee7418d446466c8f0175a54dc6210
 AUX bareos-dir-21.confd 357 BLAKE2B 819a8c4bbf66a4a629128d3b23cc122fc340eb5672e406234d1a2960c30ed075989585e1e4801b2bde8f1edeca770d80b58e58bfcaeb45fa056afab4b610b013 SHA512 9858964a291ee9849e144f968a239758e3e6905bb5420717652114d8a583e3342e50f046efa41730f30cfc3f047b485251e93085fb13b327a6f2272d7c4c0309
 AUX bareos-dir-21.service 884 BLAKE2B c0a4fb957588136cd043be2670a03e05bd5ffad4ae87275636642961e0e105ff07fb0614490a71771bb7eecfb551e6f860d8d41104e56ea8c5d434c84c5602a8 SHA512 187e331f8495d27d14434bd71baace7051d254e2886c3814493600973cd830cb01f27153321821e0a3bd2356d55f39cf0878488297079ed80bcfb2693cc77809
diff --git a/app-backup/bareos/files/bareos-22.1.2-include-algorithm.patch b/app-backup/bareos/files/bareos-22.1.2-include-algorithm.patch
deleted file mode 100644
index 5f71576bc001..000000000000
--- a/app-backup/bareos/files/bareos-22.1.2-include-algorithm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From https://github.com/bareos/bareos/pull/1687/commits/3907be7ff9700d0328198b47c58885f5ec56546c
-https://bugs.gentoo.org/920489
-
-diff --git a/core/src/cats/sql_get.cc b/core/src/cats/sql_get.cc
-index b5d921c..150ebfc 100644
---- a/core/src/cats/sql_get.cc
-+++ b/core/src/cats/sql_get.cc
-@@ -31,6 +31,7 @@
-  */
- 
- #include "include/bareos.h"
-+#include <algorithm>
- 
- #if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
- 
-diff --git a/core/src/stored/append.cc b/core/src/stored/append.cc
-index 05f6784..32234d4 100644
---- a/core/src/stored/append.cc
-+++ b/core/src/stored/append.cc
-@@ -41,6 +41,8 @@
- #include "lib/berrno.h"
- #include "lib/berrno.h"
- 
-+#include <algorithm>
-+
- namespace storagedaemon {
- 
- /* Responses sent to the daemon */
-diff --git a/core/src/dird/ua_prune.cc b/core/src/dird/ua_prune.cc
-index 9a0770c..15a0a56 100644
---- a/core/src/dird/ua_prune.cc
-+++ b/core/src/dird/ua_prune.cc
-@@ -40,6 +40,8 @@
- #include "lib/edit.h"
- #include "lib/parse_conf.h"
- 
-+#include <algorithm>
-+
- namespace directordaemon {
- 
- /* Forward referenced functions */
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 5625a3d4640c..40f4d88ab031 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,3 +1,5 @@
 DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8
+DIST duply_2.5.2.tgz 54034 BLAKE2B 918553c620a3fcf7b1b52b3ebfac1bdd94da75bdbb55f1f1489a52952d2e514066670577642ef06fd4c1420a9c0b2a3c6faca1dc82b7d6b55c8173ee46bfc1f4 SHA512 79c2260fcfe9d0282c96bb0b7a11ac3f29f836bfb799665d4d7ac5c3682743f17b650a056a5e3b755a316aa971727e610cc0b68d06190271a33c9030c3d2fa53
 EBUILD duply-2.3.1.ebuild 551 BLAKE2B 7ab7434564882e7542aefa62d6ddb8d375e3f8b8da294a5e9ec82f3f189ecddd1c18a23a7421704cbc1974854c7e3507026626da8f544bdf1466cc08e46e4926 SHA512 b4d702da9b3363bc5d7eee86a811c955c1d252750c71249435db18ec32e56ac942668160362ef9b62c9713ae8ef2ff50b1ea9f2324f125c8d622440bd9ba0937
+EBUILD duply-2.5.2.ebuild 550 BLAKE2B e0e8bacaf77a51fb16eabab7b676f301b36187060b10d6c4b9e48da0ae6399312ed0f22335b6085333efc0d989d33dd22f72fe91631c4c03479612112460754b SHA512 d827176af5243bfda7d11f9100ca17dd16c3df4cd173ce16af344f9326d718f135f462df261983e56f6abddcd06388e4fa74ea1fdc68c0b2efa01253e681f07c
 MISC metadata.xml 247 BLAKE2B af0a187f2d6c21a00076afa286d6e90e20bafa0db638595d13aa55cf04b9f295777101b5b595efafa81789922eee3712f6dd8dcd245e540fa5a541dcd930f8c7 SHA512 d168f8eb340ad623ee65ecee03f37e5bdfeb01170cbe6bba1386b83d041577b9e71424f0a99b28ddf12378b530d2b5b59345cd8816d4d8004af9e502bbb4a18a
diff --git a/app-backup/duply/duply-2.5.2.ebuild b/app-backup/duply/duply-2.5.2.ebuild
new file mode 100644
index 000000000000..1f4c929cad2f
--- /dev/null
+++ b/app-backup/duply/duply-2.5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shell frontend for duplicity"
+HOMEPAGE="https://duply.net"
+SRC_URI="https://downloads.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/$(ver_cut 1-2).x/${PN}_${PV}.tgz"
+S="${WORKDIR}/${PN}_${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+}