gentoo resync : 31.05.2021

18 files changed, 426 insertions, 379 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 1ac34079a00e..34705941bbf3 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 496a57f61298..95ec172f4788 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -15,10 +15,12 @@ AUX newscripts/bacula-dir.initd 315 BLAKE2B e2bbd011773307a24044a761f17ec7079e5c
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c
+DIST bacula-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d
 EBUILD bacula-11.0.2.ebuild 11886 BLAKE2B 9b75fcb4f5a5251e9428e5406b64c4d16691f250df5e8a73464a6fad0d1e8dd92114f9f304e9761c2dc01a71abccb7ca4cec33a6544d63fcbb72c53fae87b332 SHA512 198760cb7179adc14c740d4e26274acf543041fa7fc4992f8560ae4222a71e37f2ff20134ebf9d4009598e894a213c935af878b728c2eb7436664f29bde61614
+EBUILD bacula-11.0.3.ebuild 11791 BLAKE2B 52f1c30b3ed65336004dfcb3defcc1f40ab13fcff9448e2309835177ec953849f38b7b8ed417d2796c03075d7bdcd07c955f756cbb262d08528edbf716eff73f SHA512 deb47dc53d3bd187122aac3ae8c6eb0d206ae85776b838881d7cd27ca2c1d6eba029d435085e40188d7e033497d6bf027ad398ba495ffb3e875167a72581521c
 EBUILD bacula-9.6.5.ebuild 12033 BLAKE2B 2abae986e8bdb9e358be317b619a3be15b18fdb2ad93d00d160c9acfeec3b7ee7e5b55e54be8f85ea2edf5ee8cfbd2df7ce5aa5d599fd543c8e7df0d69c7447b SHA512 5135d97f296e93343a2661d32bb76e6a21da25c2da3f858516a9affffd8831516c7f12adbe607afa68d675bef8dbbed2dff23b594437d0ac3d77fb999af308f2
 EBUILD bacula-9.6.6.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
 EBUILD bacula-9.6.7.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
diff --git a/app-backup/bacula/bacula-11.0.3.ebuild b/app-backup/bacula/bacula-11.0.3.ebuild
new file mode 100644
index 000000000000..b2738be8a8a5
--- /dev/null
+++ b/app-backup/bacula/bacula-11.0.3.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 04f5771ce259..3a6df00751f7 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,7 +1,5 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
-DIST borgmatic-1.5.12.tar.gz 72964 BLAKE2B d71537eed019b10c3257d4b068c31aff63919e0cdb068b49c2ed92d2e97d37b8735f30b1225fb453e79372aeab49817e9200770aac4cc0f80c0bac14e84678d1 SHA512 67c7c7683e9fb7dd0321b3db6887212b040596f1d7e767cceeae6fa4cc02bb0a46344befbbc7a33b454a4692b04ae88d9031f71867788a94f771999d885112d5
 DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
-EBUILD borgmatic-1.5.12.ebuild 2131 BLAKE2B 3e655f16122c80e4caf19c03927f804136dc76b8ad7fdcbf2b2dc6e5c1587007989a9708093d9ae5b8cb1150b739d0d938b9af9c901ef335100fc214eb4ee617 SHA512 d72b6f41c03625a9238791a6d1991c327fd26ac031b394631237e84914e09491c5e10e239a24e631fde9d1c318aeead1c8b091018996f63f2fdb99893f9f10bb
-EBUILD borgmatic-1.5.13.ebuild 2137 BLAKE2B efdd1242292e60bf5c1bf85913b4958db1a995caddeff0059cb0995049e3c1938117be1c3e3e9f4bbe16bf2ff8f5b62b37b325ae1085b4dc519ab832274106d1 SHA512 60673b7f47c3451e0a97b2e739fc80e5065c212e5260cae281fc66cc42245a1c4f9ca587a8a413b9691ca932645f569521be195d8b9d16c8ab77e2e1d260320a
+EBUILD borgmatic-1.5.13.ebuild 2136 BLAKE2B d47ab1d52be44bcfdbd48f4ecc71d3e52745ac4aae355d01ea523c0365c0f2c99ad186cd1de8573e5ef55eacbf9807510926d32495ca6fde4ef4394168ff2463 SHA512 e8b6c7fe7f5eef392df91887539d908aa1fec90a05a0c1ff09950dcf225c180414e2f7760cc854f6d33bfd25d3c8cd1a6f69d904001902c04f55ed22bc62e5c9
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.12.ebuild b/app-backup/borgmatic/borgmatic-1.5.12.ebuild
deleted file mode 100644
index bea1072b4430..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
-	')"
-#BDEPEND="
-#	test? (
-#		$(python_gen_cond_dep '
-#			dev-python/flexmock[${PYTHON_USEDEP}]
-#		')
-#	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Unlike the other two test files in integration/commands, which use the
-	# relevant modules' respective APIs, test_borgmatic.py tries to call the
-	# 'borgmatic' executable - which by the time we execute src_test will
-	# not have been created yet. distutils_install_for_testing would likely
-	# take care of this - but between the aforementioned behaviour inconsistency
-	# and the fact the only test run from this file as of version 1.5.11 is the
-	# parsing of contents of 'borgmatic --version', just skip it for now.
-	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.5.13.ebuild b/app-backup/borgmatic/borgmatic-1.5.13.ebuild
index 06c3a588685e..5fd3f3e72644 100644
--- a/app-backup/borgmatic/borgmatic-1.5.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
 RESTRICT="test"
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 14c3a7ca4a7c..721658f0dcb3 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,7 +1,5 @@
-DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
 DIST dar-2.6.14.tar.gz 2148023 BLAKE2B 36653d798d1da9cd87e84d2301b9f1fd657e92d1eee91ec1efadb54e94638860103c5e509479a2da846d432328e0a93ae92e1a4d23b6956ca55341ef767fe9a8 SHA512 2b116929fcc192ffee0c266959902b45dc9982ba77e017b3217715e0c63d1574d64083ca55a63e0bb6390e8955c41ca8b09da63934826fe4f0471a63ea739550
-DIST dar-2.7.0.tar.gz 2285856 BLAKE2B 194e9fe2345bdccdb053996b109fe4efb886e23b69d440f7ac2b545c1ce2f241c7f24c56d7b68bde904b8e1a85df20716b63068a6c471c71a7569921eb06aa1f SHA512 0e207c244f6700860a84217069774162b7b56c95e5c0955813fbd96d37a3fe1fa126cab05bab0a21b3e9eab335c10961daf243024fdc35f6276468bd549d49cb
-EBUILD dar-2.6.13.ebuild 2421 BLAKE2B a16560b5fa34dafd05fcfe917b6739ffd8910d5284cba9dc28c343ba6e92f43704d2ac4e290f03be7426cd0896d371cd2ab7c648a85a5e05327800cb5f8edf99 SHA512 76dff2090770e07c49171176d149b42e5cd331e729fc054e4509598f5b5d26745de3a727d65af103cc72ed94abf103fe7be61b1c60ebab58f94688371588f525
-EBUILD dar-2.6.14.ebuild 2146 BLAKE2B 5095a9a2518b778578cd188db5dbd7ec3aa721da28742241e7b1688bd241ab63aead52082492ae4c6a60999f8f6235245204c66c3ac1dfbd6e8bca60528a09d1 SHA512 ae419297e74e0e5580905c6466e0506086c6b32c571c1b8541e5c894dc1aa3dd637308a00c859f8877ce5d04d0084410b6932370c9bc480175d3a6d72e2293cd
-EBUILD dar-2.7.0.ebuild 2231 BLAKE2B 6b82ed3c1965219f6ef8cdb9db16358f218c584558116be2a5fbf09d62acf8b66340fd56ec44d3a29fb6b5f55324a81fdac14cb6fea54c85448164fac9d9e07f SHA512 84345f585a602e3b4c6db67a8862df0b2a709be4ca2fe5341c55687e009b61d13c1efb99dc8ff92aa7692c29656fea96a58e987740bedce245278fc02fae3f03
+DIST dar-2.7.1.tar.gz 2290659 BLAKE2B 89fa7ac208eb3009f5151f27022a7a449bb204cb035f320e33ff642588b5ab0389c2ed33b71b7a7c6240d205877073f26a04f0164ce05bb370db3bc3faf25fda SHA512 404e3281b2c420088623e4c6ba262d2a7a44848986e43d4c71aff77104395f1178445d560849a73e0dbacce6b8014df2bb20bc33471ae2d07d897bb6ad577bcc
+EBUILD dar-2.6.14.ebuild 2142 BLAKE2B bdcad71a1f72bfb7fa2c2919d5aa2f135dc573c73bd1de7e09af4560a6aa6da4ccd3756b0243cb06d1d87d98e707feb779b094db97b53f2cc39e88b482d8d662 SHA512 efd78340f12c311caa358739b44c698dc42203c219d52601a626c033ac77d75dc20dae108f4e566dc563356796d5426f79d1deb119a49930ce4d0ad355ead70a
+EBUILD dar-2.7.1.ebuild 2231 BLAKE2B a14aad2ef120612fdc5132f7ebaf06290e0a211a4d226426eab35a17ba8bbe99ea85010bd863f2d99170cec281b0010e2037b0ac015b3f85aa1e1bc0c4bb7263 SHA512 5e0714206198610ab21cb54e8ed69e6f474f5d103a498448040ddeaa609a9e735b7ce1c952a731c8bf9819f136a92b38b51f6c5da3993554f90eb6c8beae0be0
 MISC metadata.xml 1283 BLAKE2B c8686b55e5aab51bc28ace7dbc34af0e40b3b593d2fa8a5a27b746b4e14382b9762593cc9094c8e44bd98fac91eeff1bdce611210991230da6b5ec896e66626c SHA512 592dd28dfbb3dedfb2a7f731893f50e64d08aed3d8cc7aeb15a5d7e382c777d94e8c6b984e4aeeb7c73705a473bd5ae0d885d08b19bcc9370458e0891741d942
diff --git a/app-backup/dar/dar-2.6.13.ebuild b/app-backup/dar/dar-2.6.13.ebuild
deleted file mode 100644
index ec82d1c077b4..000000000000
--- a/app-backup/dar/dar-2.6.13.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
-IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.3:=
-	!static? (
-		app-arch/bzip2:=
-		app-arch/xz-utils:=
-		sys-libs/libcap
-		curl? ( net-misc/curl )
-		gcrypt? ( dev-libs/libgcrypt:0= )
-		gpg? ( app-crypt/gpgme )
-		lzo? ( dev-libs/lzo:= )
-		xattr? ( sys-apps/attr:= )
-	)"
-
-DEPEND="
-	${RDEPEND}
-	static? (
-		app-arch/bzip2[static-libs]
-		app-arch/xz-utils[static-libs]
-		sys-libs/libcap[static-libs]
-		sys-libs/zlib[static-libs]
-		curl? ( net-misc/curl[static-libs] )
-		lzo? ( dev-libs/lzo[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-	)
-"
-BDEPEND="
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-	doc? ( app-doc/doxygen )
-"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-python-binding
-		--disable-upx
-		$(usex curl '' --disable-libcurl-linking)
-		$(usex dar32 --enable-mode=32 '')
-		$(usex dar64 --enable-mode=64 '')
-		$(usex doc '' --disable-build-html)
-		#$(usex examples --enable-examples '')
-		$(usex gcrypt '' --disable-libgcrypt-linking)
-		$(usex gpg '' --disable-gpgme-linking)
-		$(usex lzo '' --disable-liblzo2-linking)
-		$(usex nls '' --disable-nls)
-		#$(usex rsync '' --disable-librsync-linking)
-		$(usex xattr '' --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	if ! use static ; then
-		myconf+=( --disable-dar-static )
-		if ! use static-libs ; then
-			myconf+=( --disable-static )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/app-backup/dar/dar-2.6.14.ebuild b/app-backup/dar/dar-2.6.14.ebuild
index 414cefd61db1..db1ecf5856f3 100644
--- a/app-backup/dar/dar-2.6.14.ebuild
+++ b/app-backup/dar/dar-2.6.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
 
 RESTRICT="test" # need to be run as root
diff --git a/app-backup/dar/dar-2.7.0.ebuild b/app-backup/dar/dar-2.7.1.ebuild
index 0b4d6b7ae696..4c1779cffd3c 100644
--- a/app-backup/dar/dar-2.7.0.ebuild
+++ b/app-backup/dar/dar-2.7.1.ebuild
@@ -14,6 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
 
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
 RESTRICT="test" # need to be run as root
 
 RDEPEND="
@@ -41,9 +44,6 @@ BDEPEND="
 	)
 "
 
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_configure() {
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 0e3bd20ba18c..c69e0ec561c6 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,13 +1,7 @@
-AUX duplicity-0.8.15-fix-docs-cmd.patch 888 BLAKE2B 17627c86ed5b895ff08c6394b407b69f8653913d7e1bbbcd994c574a817e7f018a8b6f26819a147387414f9997b32e95fc76e2f4583158ee453d03a489b8b4b7 SHA512 a901c5870fcc6745873b5850b2d2544948cb766d72d7ca8f8869d03bc9512f4527ec62df3f29a1151675a91e6c6b3816069008d1b5d56e45b787e2bddaed4aa5
 AUX duplicity-0.8.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
-AUX duplicity-0.8.18-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
 AUX duplicity-0.8.19-fix-docs-cmd.patch 628 BLAKE2B 6acf30fd8881a14003a158e76a23b81af0e049c090c671adbf147c7a77b5ed57e75b9c9b169e38a06fdceb310bdc4f74bacb543a66e5820d3d1ab9951dca997d SHA512 6b2e401d6ce8c2ee41dd1ea8ffaed7602b8167fbf0cf465c214ddf8d1ef8af8b74a1a6c93741c6b34705b53b2caad438736a6ee7c6c3483b11d8ede029758348
-DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
 DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
-DIST duplicity-0.8.18.tar.gz 1352646 BLAKE2B 9703ad0780d6bd7db970941f529192132f1b7c138c72831cfdeb1b703dc9d952e28cf453a77a62babc872ec57d9193fa7293607401e278d12ec8143f779d2a60 SHA512 fd9dc472e4145725de343a3195ca8c898570ec492d46bc385d354c40b2c31e7c0da1f6e15e2a4a391d35926ae77e854992f4c973e55b072006c3f6489e27408f
 DIST duplicity-0.8.19.tar.gz 1372739 BLAKE2B 6a5a642597529eea37c7224cbfdd115db42c16f6391e553454f8f82cea86240bbd68a62513129496a1f978411fdeec50c3d918bb99b470fa1444fd77e7e6c9b7 SHA512 c1a1f5894f8b94ac61bd98270f138c58ef5a68f3624e7e88224b15539ca6e08874df9cebb36b10167d133b1af6a93b29e7bf4084c348b9cd7914ff24415be57c
-EBUILD duplicity-0.8.15.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
 EBUILD duplicity-0.8.17.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
-EBUILD duplicity-0.8.18.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
-EBUILD duplicity-0.8.19.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
+EBUILD duplicity-0.8.19.ebuild 1202 BLAKE2B b2ec8a0ef183bd7b20d018c44eca71dc7440ae910d2d97d5f0ba9185cd9982d091bc79400cecd1bcae86efb46178973aae9c467b7749db976bbd7cff9b622437 SHA512 6cdfb73228e6327fad27f28725d48353b9e1c933470c51fd73d5aec98623916878a69964cea9fb0dfd812fcd1abd99f3ef7846b9b1b816db5117e68929615f43
 MISC metadata.xml 454 BLAKE2B 08e99a3d0e80e38e1ec062be7e4a1a4cc5b8d9e579381142a7c274c27cf585b7c3fd62fa14b1b2b486ec26d8aec4f7dcbc91fa7d8400b36fe609e240c67d6552 SHA512 a4c895eaf690f40fc197acf26501b2da386a3af716b4dda87d84e2d459ef9642e19e1e5ebca8a6ae156c272321d82279e573eaaf1ad3e19e7d5dd35e9f9e69ea
diff --git a/app-backup/duplicity/duplicity-0.8.15.ebuild b/app-backup/duplicity/duplicity-0.8.15.ebuild
deleted file mode 100644
index 8f7cf391d022..000000000000
--- a/app-backup/duplicity/duplicity-0.8.15.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-0.8.18.ebuild b/app-backup/duplicity/duplicity-0.8.18.ebuild
deleted file mode 100644
index 4b901f06dcdb..000000000000
--- a/app-backup/duplicity/duplicity-0.8.18.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-0.8.19.ebuild b/app-backup/duplicity/duplicity-0.8.19.ebuild
index 4b901f06dcdb..25044aa70a1c 100644
--- a/app-backup/duplicity/duplicity-0.8.19.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"
 
 CDEPEND="
diff --git a/app-backup/duplicity/files/duplicity-0.8.15-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.15-fix-docs-cmd.patch
deleted file mode 100644
index 0f8277cc7f3f..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.15-fix-docs-cmd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- duplicity-0.8.15/setup.py	2020-09-01 15:45:48.664058429 -0400
-+++ duplicity-0.8.15/setup.py	2020-09-01 15:46:44.745709363 -0400
-@@ -93,18 +93,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % Version,
--                [
--                u'AUTHORS',
--                u'CHANGELOG',
--                u'Changelog.GNU',
--                u'COPYING',
--                u'README',
--                u'README-LOG',
--                u'README-REPO',
--                u'README-TESTING',
--                ],
--            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -340,7 +328,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
--        u"build_scripts": BuildScriptsCommand,
-         u"install": InstallCommand,
-         u"install_data": InstallDataCommand,
-         u"sdist": SdistCommand,
diff --git a/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch
deleted file mode 100644
index a0fce6b2c5d8..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- duplicity-0.8.17/setup.py	2020-11-24 19:32:40.089024404 -0500
-+++ duplicity-0.8.17/setup.py	2020-11-24 19:33:32.326309755 -0500
-@@ -93,17 +93,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % Version,
--                [
--                u'AUTHORS',
--                u'CHANGELOG.md',
--                u'COPYING',
--                u'README.md',
--                u'README-LOG.md',
--                u'README-REPO.md',
--                u'README-TESTING.md',
--                ],
--            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -339,7 +328,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
--        u"build_scripts": BuildScriptsCommand,
-         u"install": InstallCommand,
-         u"install_data": InstallDataCommand,
-         u"sdist": SdistCommand,
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 6b815bc935ab..21c9b28e47b5 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,5 +1,3 @@
-DIST duply_2.2.2.tgz 50848 BLAKE2B d24c88c57a1a1da83827fbda3ba73249bea96de3b9503b842357182e871ac519b609d6d05d5972cd9a268354fd4d9db87d57680d478714e5f19256b70f23fa42 SHA512 2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358
 DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8
-EBUILD duply-2.2.2.ebuild 522 BLAKE2B b8e653ad4fb5a3f8eb479e4702feb27ac408719a3588d060b738cb119ccf17155fc7c7108454e694c93309d785461b27212abaee09a4f485f7c82a33e0110e82 SHA512 5fdea7287f4ff925b2f49a604ff350b0da42b134c1aad53fb43cd5dee65ecac17ae1edc7faeaf67cf346ee665cd74030bc2e7ba94e9d012947c7feabd2837e06
 EBUILD duply-2.3.1.ebuild 540 BLAKE2B ce16e342ddf3c9f30c9803f59cb9e981e6481c79e3f223d73af37ecf57fc36643124ab84d076667b1b769e8688bdba64b57c2bf53da854263d348c75ad26eda9 SHA512 681bd875e939295b2df0ecd3da8e84a7707c0f7b89e97a63c8ed63d6688f0f4182e45f93a267fae5ee4b3062a6209b28be5faabd7c81276e53edb86b33c6da7d
 MISC metadata.xml 474 BLAKE2B a4ac0dbf3e29853bc40b8c718a01409def4f6a956f4bb6cfe1657e79c71f09e11258dc2cc0b7443375af70cafcb31211200837d188b3833ea136b25e54234e03 SHA512 1f89f05c042d63ce2851246e68039293ddfc85de6a3a16b36c6de54abe7297326b03d9668dfbd7666ea0d5091975b83abb01a077254f279d76f4739760392e86
diff --git a/app-backup/duply/duply-2.2.2.ebuild b/app-backup/duply/duply-2.2.2.ebuild
deleted file mode 100644
index 443e0af71240..000000000000
--- a/app-backup/duply/duply-2.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="https://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1 || die
-	doman ${PN}.1
-	dodoc CHANGELOG.txt
-}