gentoo resync : 13.06.2020

29 files changed, 1220 insertions, 218 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index fc5233d2b592..b64ed598be97 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 7450980606b7..96ac3855d603 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -19,5 +19,7 @@ AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516c
 DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31
 DIST bacula-9.6.3.tar.gz 4246447 BLAKE2B c591fcd5a6c3a79b52cf778f7719ad59f35bfdf99293abb4f6e9c701c0d545125734721a926f071056433d7a9801c40c546f4a73770f5d0fea9fc33c334bcd93 SHA512 8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f
 EBUILD bacula-9.4.4-r2.ebuild 12298 BLAKE2B bbb89cabb538ea1fde82056773d6f0463915b3a087006082ae083d6ef2f7b0250231e8c55dc6f8595a7c4fd58d82cf00c123ba2e6a362f20b2d41a200883afc6 SHA512 a699eb6220dd921b275ac5b660291548e5e57c0ca48ae8bc8b587e63cd002781218b85316916268dbd35cb29d7f2c476c76f5b08e3ad57206ccd84ed7d609ee3
+EBUILD bacula-9.4.4-r3.ebuild 12451 BLAKE2B bd1c38e2603655baaf59eea045e3a3a060fc13deb1ccecca4c25ddc585f67dcb9848b01fe25a09d94374bcaf6ff9d2f5da846e6e7cffae8eb3b768b3c91b5227 SHA512 42e95ceef2b902d9a24b2129915f07c2e3d5e147f1207ebfc3aee49455a1aa7136c805f89ad5a70b26df0857ab2fd8de2832c8bc93016ea76679b4dd1586e3ff
+EBUILD bacula-9.6.3-r1.ebuild 12363 BLAKE2B 3a7f9be5b6fd12780433d1a9fee56e0d59ea0ef379d0a4a3975ef1b3286394953c80ca2a160146974dd51d989bc7f08e44c4db4227a3fb746705b71f220833a9 SHA512 4e014e6996a167de2f4e5fef5504d9783c6e193265ecdd3fa2a6f3373c1409d9a7fcbc2b1eb9a2a20248a4970bd09822aadc1c7ae7c8206fb3ebaf35e88056aa
 EBUILD bacula-9.6.3.ebuild 12216 BLAKE2B e0e04979c5856f7832e67527472190c0ceff0840defdcf7a277e723cc3029bdd96264cd5cf682ce50b8b63e1732912cbbcc3aaa8fdef5871e11fff31c93bd99f SHA512 723d00d6dc36f1b7ca51cd959d882d7fa54734be1faf75ce8390e25f8300210aa342bff28a3079459a53332c4abc99f47dda9bb125d8298d9442fc8fceff69e6
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.4.4-r3.ebuild b/app-backup/bacula/bacula-9.4.4-r3.ebuild
new file mode 100644
index 000000000000..6ebe92cbe9a4
--- /dev/null
+++ b/app-backup/bacula/bacula-9.4.4-r3.ebuild
@@ -0,0 +1,429 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 libressl 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? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl: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}"/9.0.8/${PN}-9.0.8-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
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	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
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
+	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
+
+	# 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 readline readline /usr) \
+		$(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/*
+
+	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/bacula/bacula-9.6.3-r1.ebuild b/app-backup/bacula/bacula-9.6.3-r1.ebuild
new file mode 100644
index 000000000000..55c0d02d3b89
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.3-r1.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 libressl 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? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl: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}"/9.6.3/${P}-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
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	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
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# 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 readline readline /usr) \
+		$(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/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index ffa73f96c28f..e5b13bb321b1 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,6 +1,6 @@
-DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
 DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
-EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B ae27cdf2189b79b8f92b81fae737864cf1060760794309bdd8b2b7e58b8145f543540018846c2389fe67da3a8f2dc03358c58643883547e0a095a9dc57183156 SHA512 b73ff4cb83104d0b1f262ec6c663d7282f9508538d901e8956705326419fb5eba2019ad914015f15b9fa228885f42409aa8a11a1f22fe214eb847839d73f8364
+DIST borgbackup-1.1.13.tar.gz 3754457 BLAKE2B 3d3dce66ad685fbde53cb78e288b4edc53af449ed54379e5f0b9ab3b10d8cf43ae983de5abeccb1874fbf1283f3e2796ac35ff9de349905d03d0b0c560f4fa93 SHA512 2480dba6c842659a248361b35b478120e50df3525b8f07d89dac4e78369bb1dad2679b9efa6a4d6f38637759666095dc2dcbb7750edccd97972e2c8980a51b84
 EBUILD borgbackup-1.1.11-r2.ebuild 973 BLAKE2B e8dd617f96ff6873902be290ac5a215339dc9c5f6ccb988ee4eddd907bb77c6aee1b0f3bb03a0f31359d7f2e6d4c7bd6e1121fd1b130dc2acaf266a1eb907104 SHA512 8c91ebd25c8f7318d049337f1dec71da3a2f7c69e38c6d0d8ab6ff14d9b4aff95710d5e2a595e008ab9d85b7e4c8b11bbbf7c2d26894b161ddb993ea6fbcb322
-EBUILD borgbackup-9999.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2
+EBUILD borgbackup-1.1.13.ebuild 977 BLAKE2B 15f4499fa695d0ffb04b3c608116cbba016c60b4dcd08e966af924c7ea22be3fe5926584ce11e930574a5fedd111b623a32835ce9b21fb6a71ff20437fd5bd7f SHA512 99b1f7c7eb89485d9be3d479c1c74a24e16a5e6d1857e75e4214c8380e2134f362a766d9159bfa90fbd757e09c147e6b03ef83cb32399b590eec801f9c04eca8
+EBUILD borgbackup-9999.ebuild 977 BLAKE2B 15f4499fa695d0ffb04b3c608116cbba016c60b4dcd08e966af924c7ea22be3fe5926584ce11e930574a5fedd111b623a32835ce9b21fb6a71ff20437fd5bd7f SHA512 99b1f7c7eb89485d9be3d479c1c74a24e16a5e6d1857e75e4214c8380e2134f362a766d9159bfa90fbd757e09c147e6b03ef83cb32399b590eec801f9c04eca8
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.13.ebuild
index 527493a36712..ab83a2ead1da 100644
--- a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
@@ -28,7 +28,6 @@ RDEPEND="
 	app-arch/lz4
 	virtual/acl
 	dev-python/llfuse[${PYTHON_USEDEP}]
-	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -40,12 +39,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-python_prepare_all() {
-	# allow use of new (renamed) msgpack
-	sed -i "s|'msgpack-python.*',||g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
 src_install() {
 	distutils-r1_src_install
 	doman docs/man/*
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index 3b9d5248820c..ab83a2ead1da 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index d9e99dfaabc1..c1c340283e2f 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,9 +1,11 @@
 DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
 DIST dar-2.5.18.tar.gz 1931746 BLAKE2B 3d47665a1ab955ab9467d8f10a686565c549e1be57e77a9bcf65f1ea25c9b70d6d148d4b9dc35112b3ca74f9df05505c74e3a7eaa211b6a8b466308121206a2f SHA512 cde787bb4c3a3a1014efdb5e437b963d762eb87c512e1de1d60471035c535965e03adb5f75abc2bc95633bb6fb61226027d836a87fc903995e3a27a540632e69
+DIST dar-2.6.10.tar.gz 2140424 BLAKE2B 840a7a3d33825658be541157468a15bc3a3082083a35c426ecbab1cd2e8026e0a4d15671a33472068e1256878d1f60d414c2c069a3223ab5050756b13c887b69 SHA512 2fceafba6c6851c5dd11c0d1a3fda8aeddac16f39cf0051027b178703a5e821fb769c42624063d8722d80ea62bb735f3b0c6c39538c1c939234df49d6b757428
 DIST dar-2.6.5.tar.gz 2104866 BLAKE2B c31e06abb384d03d0180d3dd99067916de96286838a1aef8748ae6119651ac142388633c7946d0c7864f41a42c555ac79b0811af7594c5d6370fb9c30b975bc9 SHA512 e646ac51c5c140ca3e573a4e63ba47af6fcf19c0aeaa0d4791dd7e781478c8981cd31e1a2418d2f1fd8ab92f2c9812f3b712bc0fcbbcdfbd131c8937100a4790
 DIST dar-2.6.9.tar.gz 2137419 BLAKE2B 647dbd272832dabd8c6255ebc27040dceb428d7ea807146c5c4eabb7095eb7c57010a11a5bc3dfa73aa299c627e5230be9560ca5246b7591ed9705dac17181cd SHA512 9ee4624fa1cfa0e523653e3dca032a8b7ac200b3318ba21869c19a9102dd11a923c979e5186591011161a2ed07f3c7668b572620b3be197d4bfaea903c259151
 EBUILD dar-2.5.11.ebuild 2407 BLAKE2B f71b6baf86b3cbbf9d4f5f994efa72f400ef71ace22b42aabdd5b7ecf2171a4d9c7e73824fe1a29d45ebeca984761b53768cd2787331f16a63c2dd19709cb012 SHA512 8e050813809be8c1ca94aecbe0906c88758e85f6065d8472bad3e89304701eeb53f16d573a5ac546227bb8c2e3e87121491d7b27785b9231739e6959168c0b93
 EBUILD dar-2.5.18.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0fc2ee3f059bee3cdd1c1fbefc10765c9f83cd48c512e1bc634b93612aaf91498e73e37a71580d02373216ab SHA512 4da51e445dc0fe62d0f615b652fb53d3699a942bc1371616a9cd9f52a1bab61fbf5d5397bacac3d8ce1cae24554feff56b3392dcc6fe23564f9eadd4725b85dc
+EBUILD dar-2.6.10.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091
 EBUILD dar-2.6.5.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88
 EBUILD dar-2.6.9.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091
 MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
diff --git a/app-backup/dar/dar-2.6.10.ebuild b/app-backup/dar/dar-2.6.10.ebuild
new file mode 100644
index 000000000000..607253da2b02
--- /dev/null
+++ b/app-backup/dar/dar-2.6.10.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 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] )
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[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 )"
+
+#PATCHES=(
+#)
+
+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/duplicity/Manifest b/app-backup/duplicity/Manifest
index c33005d8cda9..d59fd97a9d55 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,13 +1,7 @@
-AUX duplicity-0.8.09-fix-docs.patch 549 BLAKE2B 57e20c1f65918e548941ce56969a9a22620bb69577ca1c0168149f28203f0d1068fd6676ade5ef153069823070e033791b4a4e517e79a11d9b33a30f6444c174 SHA512 0ba8e5f02e5e873835ac418d312694ea6b699fc15a2b09828aaa0e2b75bb499d0b054799c619d1bd8bafc97e042eb12e6a64a3c0298158cbc7c2dcd30216f4a2
-AUX duplicity-0.8.11.1596-fix-docs.patch 665 BLAKE2B f664af2867546957fafdf717b792ebc8e4d75fdd6451d7c252284107f8fcd4029d2815ffa21c622738226885e396b25a1f2485f44a15275e0a8b0b248ea27735 SHA512 4ce3d557c5ef3e32f9032cc10285b8059800b8d0f57e46ebcb0fc85a1da361b0475303ba94f8e4a25a70cb27b506de477d7657fbfe0b77d80646a3025bcd8bb2
 AUX duplicity-0.8.12.1612-fix-docs-cmd.patch 859 BLAKE2B fd3e94fcd2f408a3c81b0ab3b749956dae48e540b1c826d79ba411ed24729874a60757543539610b6aed99123f3a34dbfe432663f73824325da748410ff5a0dc SHA512 4d1c6101b93ae8ee8bd3ba3203ed4c149a13c7b41e4ce11a048d378bc0ad54b2e51b2a3d7ef93c9935e980545e68425f52582f9eddeec465095ee31f40dfee71
-AUX duplicity-0.8.12.1612-fix-docs.patch 665 BLAKE2B 5a82b97397d63153df54b0bdfc62e2896980fd665b91cacff92aefd143b23ea662b6d0ee0cd6251938a41a83e3046d027bf4bfffed1e90cbec1240d2ff0c9b95 SHA512 20b2827e72b441f15d9abfb63f0415758f83b82f3669e104b6b9d9db4d3d00401defe42d9c24415197795535049f280ef6b7c74a15c55e4ce61837d85b7eed4d
-DIST duplicity-0.8.09.tar.gz 1856764 BLAKE2B b5d0dd3270c237694000dc36a65a4293c43264edf933a195692d2847d008a898d5cf95c0b21b285503023ef8885278485cebabc2d2b7094ae65e13d277c80e5a SHA512 e4045a1c1adbf0927ee5325f02b79e7c0b38034080be4b563f20f1af593c8c1943a772fe7f212730e60f7c7cee93756426fe769a62050d42651fd1af7f6ba50a
-DIST duplicity-0.8.11.1596.tar.gz 1872223 BLAKE2B ad3ee2536731d1a6e8fb3fd87bb69b8ce8b43bb90688fe957cfb2718ad44f57db98c3aec4805356a7d44bea681f6ec9603aa082dbf86e58684fbe8000d1676b5 SHA512 67940d73d8213559ba88ec21e1326aca0dd065888cbf2e3c68f0f515ba9246100fd6e6d0bd1f12cb678702559f2266b7905931506d2ff6fe6fd35c673593479b
+AUX duplicity-0.8.13-fix-docs-cmd.patch 863 BLAKE2B b5ba9fb41d3e863b6064e0a76f778fd52cc7544495500e7106218cbfd30a484c499c03132752cdacef43c7aaa299982a0822e433767fbc94299e0045017c7168 SHA512 3c9c4e4c759a0cc4ba7e3b9be9955ad16638baebd1720dadf902be32ccfdfdc306973f8897e99af1c67b5b689dd1713ed8928e25cbbf26040b4e8070e89de346
 DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951
-EBUILD duplicity-0.8.09-r1.ebuild 1134 BLAKE2B 04496a663087d1a1e068c42d2037df9920d3d628ec1e9ebd45113f36a8c92103a293fab7875e386742c69f1bd9d0c076db13b85b4721048d9fc7bd45e9d4520d SHA512 dc7ef2f8e721b890265a0f17e62139e2918cf6b5722f38725868cfe740c440fbbf3cb13b33e5ff9a5c11416a59b0f6b4a031a19fb03a65161ce76d5d7611d9cb
-EBUILD duplicity-0.8.11.1596-r1.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed
-EBUILD duplicity-0.8.11.1596.ebuild 1145 BLAKE2B a8d81c55738f9321e39f1a3676d3d2acb7f08115893bcf5f1da5dad6cff6de0b99d0358b18877682b7e4586380a8addc8c4766452a974259e40cc6dcf538c957 SHA512 61da41a243dc4db5304c2239da604d05b7ad8081e7273af0b94fe1ad566ffc7e848d4e8cb7a542dbf746b88205c9bba71dcc5509714d7eff79e6b71dcdfc4228
+DIST duplicity-0.8.13.tar.gz 1463564 BLAKE2B 31037b0a27e043937f80ee91939793e304c0f7b1c96ee4bc9fe7c06dde69f374a718028d9ae4a98cfd7f866af72e5ed0a8f679319a73428207a99961961e8d2d SHA512 71e07fa17dcf2002a0275bdf236c1b2c30143e276abfdee15e45a75f0adeefc9e784c76a578f90f6ed785f093f364b877551374204e70b930dd5d0920f7e1e75
 EBUILD duplicity-0.8.12.1612-r1.ebuild 1157 BLAKE2B a83a4638ded58e9efa48c726b2e718d24a0dffc69dfa372bce56818059f58230e4050490efe2d9eba17c0abfd686a8c6b8c69bedcd3108d35a7e07fea173ff36 SHA512 b4f7a04ba7d1e0f56b6b335fac26efbaa448fb53714c84df34595c7126c9b49acbfe28e44bdd2e6fe240827d307f1379ebe1e2fe78fb6dbe0bbf4fe412f39898
-EBUILD duplicity-0.8.12.1612.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed
+EBUILD duplicity-0.8.13.ebuild 1205 BLAKE2B 5d1a72ad6fbd6a0c1b4de39d66ccaedaa389c1755d902d0c2ccf2ca5843c59451e4f27006594729a3b4d0b6e9698912ed558e6eb5f6c0a73f9c02da57d0d208a SHA512 d230b126a6f20a5b2f2b78db0569ecb7683955dda2e164975ae3b5ee658c9d471eef1e644456485181ce6b92dd727a1c29cd752208a58acb6dfe9a9ebe2029a5
 MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a
diff --git a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild b/app-backup/duplicity/duplicity-0.8.09-r1.ebuild
deleted file mode 100644
index 6507cb77f9b0..000000000000
--- a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${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.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.11.1596-r1.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild
deleted file mode 100644
index 3f789257f08d..000000000000
--- a/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://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 ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${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.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.11.1596.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596.ebuild
deleted file mode 100644
index f9ce35aa9879..000000000000
--- a/app-backup/duplicity/duplicity-0.8.11.1596.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://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 ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${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.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.12.1612.ebuild b/app-backup/duplicity/duplicity-0.8.13.ebuild
index 3f789257f08d..afc6288b43a1 100644
--- a/app-backup/duplicity/duplicity-0.8.12.1612.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.13.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
+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"
@@ -22,6 +22,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		app-arch/par2cmdline
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -37,7 +38,7 @@ RDEPEND="${CDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.patch"
+	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
 python_test() {
diff --git a/app-backup/duplicity/files/duplicity-0.8.09-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.09-fix-docs.patch
deleted file mode 100644
index 2141a359b896..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.09-fix-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- duplicity-0.8.09/setup.py	2020-01-19 21:15:47.770168177 -0500
-+++ duplicity-0.8.09/setup.py	2020-01-19 21:16:53.347709792 -0500
-@@ -51,12 +51,6 @@
- data_files = [(u'share/man/man1',
-                [u'bin/duplicity.1',
-                 u'bin/rdiffdir.1']),
--              (u'share/doc/duplicity-%s' % version_string,
--               [u'COPYING',
--                u'README',
--                u'README-REPO',
--                u'README-LOG',
--                u'CHANGELOG']),
-               ]
- 
- top_dir = os.path.dirname(os.path.abspath(__file__))
diff --git a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch
deleted file mode 100644
index 0cd64d6dc36e..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- duplicity-0.8.12.1612/setup.py	2020-03-05 09:18:42.532941503 -0500
-+++ duplicity-0.8.12.1612/setup.py	2020-03-05 09:20:10.612061492 -0500
-@@ -88,18 +88,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % version_string,
--                [
--                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':
diff --git a/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
index 6b8c710f3160..23b31e23fc07 100644
--- a/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
@@ -1,10 +1,10 @@
---- duplicity-0.8.11.1596/setup.py	2020-03-05 09:18:42.532941503 -0500
-+++ duplicity-0.8.11.1596/setup.py	2020-03-05 09:20:10.612061492 -0500
-@@ -88,18 +88,6 @@
+--- duplicity-0.8.13/setup.py	2020-06-02 16:19:25.127576334 -0400
++++ duplicity-0.8.13/setup.py	2020-06-02 16:20:33.730535892 -0400
+@@ -89,18 +89,6 @@
                  u'bin/rdiffdir.1'
                  ]
              ),
--            (u'share/doc/duplicity-%s' % version_string,
+-            (u'share/doc/duplicity-%s' % Version,
 -                [
 -                u'AUTHORS',
 -                u'CHANGELOG',
@@ -19,3 +19,11 @@
          ]
  
      if not os.environ.get(u'READTHEDOCS') == u'True':
+@@ -319,7 +307,6 @@
+         ],
+     test_suite=u"testing",
+     cmdclass={
+-        u"build_scripts": BSCommand,
+         u"install": InstallCommand,
+         u"sdist": SdistCommand,
+         u"test": TestCommand,
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 2df2fc5d4c76..63e5e1be6ef8 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -5,10 +5,12 @@ DIST duply_1.9.2.tgz 36222 BLAKE2B e1c028423eb8631598b662ad33f3cf24088f11e84ba2b
 DIST duply_2.0.1.tgz 44914 BLAKE2B 022a99e585a6231e85af84ae161988037fecf885a2a97d078e1a64b2176268ea6ef3c68e4843a967715ff362e8f24826cd800f0c1b32c4b187f5261d2b9cad67 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec
 DIST duply_2.0.2.tgz 45406 BLAKE2B 46299930a2e05c5d3759e7a90a6bab8b41b28bdab95c945f1bbb5977d78cf5b72090edfb10bd69b2539c65b7c3804d45eb6b400866c6337fc4acdc283f8003e0 SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a
 DIST duply_2.0.3.tgz 45542 BLAKE2B 101e19712546c71af16f5988f1d1a70139414b03fa6abcf9b82b8a656a9fd7385b4c9f524eb0e62e3af1b9d0b9a494e47505f2c829d39745c8b88ce56e6608a6 SHA512 c24dd57f75ab80795d67baf8a7ab79a5ae9608c7faea0ae8b711045371ef0cba49c855cfa0610f030c1c37734775b50052fd1e4162420cb3db624f984e4e8bc1
+DIST duply_2.2.2.tgz 50848 BLAKE2B d24c88c57a1a1da83827fbda3ba73249bea96de3b9503b842357182e871ac519b609d6d05d5972cd9a268354fd4d9db87d57680d478714e5f19256b70f23fa42 SHA512 2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358
 EBUILD duply-1.11.2.ebuild 586 BLAKE2B d49c29b3a57e4992162b37ef550670097175b76c20f166785bf940b4aa8de1bd709658f39ae6d97d2e4620616cbd525654b9c11cd0245e1b1297238cba286134 SHA512 9c260dfe8d5b8604cd17181c7cf91f8f180c5c7623bb615a7ceb68970e2162ef0905f8e19aa4525561865ea1803156cbc77dfe287db6b99db229fb07d998e961
 EBUILD duply-1.11.3.ebuild 589 BLAKE2B a2809b3b4c11f4a29915edc004b1d117416b5551a371a4e950760bb63cdf06867b3e4d077bf4840aaa488035e94e2870225f81bc0d60b58c99d6132d5774f54f SHA512 c56bdb7d9e4d183494c0498c004fa21114a86b651336648cc5b2e0036a2d2b51acced93acdadc26b828f50a37f404446330f5671d420c4ed26c05642e5262a9f
 EBUILD duply-1.9.2.ebuild 515 BLAKE2B f684ee48cb886dc61947ff27bd4d22f14be12fa70e3d5ffb80071c519bf850ecfa2dfaaad529cdfe4d9d394cde6bba9e0d19bedb37c920b1195d84a6289d76a9 SHA512 4a1c380148270581af3a0096f3f0e5263ad0c7507066c8c308c262eaef28e3f59fb02f85d150d73e61ae93273c4a0efd45fc78ace3a160b878b8f708b855fb1b
 EBUILD duply-2.0.1.ebuild 588 BLAKE2B caa38a62e139fecdadbda7bca01d1c1cc2ae998a09dca27c18015b28e907a6a2d603f6b6437cc7e766f378d93733ee9cd98c4a3be502d3f1622ddd4ae900da38 SHA512 aff7359b9c6b4c48b6902cb3c16a18581c01e68a83b7eab89ecb091d31021c8353425ae5be197ed9034914381f884927a75b7d8386cf32e3744efbc3528ca50d
 EBUILD duply-2.0.2.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
 EBUILD duply-2.0.3.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
+EBUILD duply-2.2.2.ebuild 524 BLAKE2B 01e6ff222868c93f027c74cf1687e37a113fc84746ca3ba3e85569ceada1041777c3185d906bc62b059c5f2ae5296eb3b9adab8007c61facda6bb508aa70cd81 SHA512 d4295e955983f89e57caf024e1d0e2e1c16498a18bc81663e547fd3e263a3329bfe23b52aa4957307ad035afe9390e2edd5bb85fcd500651b7f950da280fd120
 MISC metadata.xml 251 BLAKE2B 047dd5866af91af4be51a48a590d9a3d464494b4c0bc2705610464b91aa4ba600b3599780d597ad9ecf8d033911514c2cae5ee95013ef33fdd7391732e1b078a SHA512 a0a5c1972abfc47c2f46712a9d26e5f4f6df8899c4cc19896abaafe71d6f18268c0a969fbf34b7eecc5eced74da7e2d09aa7e1fc799b636b7981cfe1dedce7f7
diff --git a/app-backup/duply/duply-2.2.2.ebuild b/app-backup/duply/duply-2.2.2.ebuild
new file mode 100644
index 000000000000..59e8e9f1f657
--- /dev/null
+++ b/app-backup/duply/duply-2.2.2.ebuild
@@ -0,0 +1,24 @@
+# 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
+}
diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest
new file mode 100644
index 000000000000..e848bc9082c3
--- /dev/null
+++ b/app-backup/kup/Manifest
@@ -0,0 +1,3 @@
+DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8
+EBUILD kup-0.8.0.ebuild 966 BLAKE2B 39608607ccdc7ca20d6bed3300c814541bc45f554a7ae85bc17d4c1fee0f26497d22036b1d49d91c60cbc0ed47bdcbe44851f101d2fb64b0342f32e49e36e499 SHA512 40b375aa355ef12213be39303e5a196f30076024ab8ba6a761a67938e66f715923421e9307a9f63b3fe12520646e0faec604e565f5fbc9a034c650f56200913f
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-backup/kup/kup-0.8.0.ebuild b/app-backup/kup/kup-0.8.0.ebuild
new file mode 100644
index 000000000000..ab78240f7021
--- /dev/null
+++ b/app-backup/kup/kup-0.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+inherit ecm kde.org
+
+DESCRIPTION="Backup scheduler for the Plasma desktop"
+HOMEPAGE="https://www.linux-apps.com/p/1127689"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgit2:=
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kdbusaddons:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kidletime:5
+	kde-frameworks/kinit:5
+	kde-frameworks/kio:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/knotifications:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
+	kde-frameworks/plasma:5
+	kde-frameworks/solid:5
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtdeclarative:5
+	dev-qt/qtsvg:5
+	net-misc/rsync
+"
diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/app-backup/kup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 0d091524131b..80ffff793e3b 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,4 +1,7 @@
 AUX rdiff-backup-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebabcf5683d7dce16a149db67bcdc7307bd2efe8c65668ca2bf2fd5b8dc3f6712bad874c0f4e6e47cd39e0374cb9972fd0317 SHA512 b5e453bdec77602e242436770fa610b85426939bd1625f560ebaee20bfd20b788ab54eefd2461fae62190d72c708487866ae06a1524ec1bbd7327c52522c921b
+AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
 DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
+DIST rdiff-backup-2.0.3.tar.gz 422823 BLAKE2B 0d4f3165abb8893dfe0619ae80f4c93e676012c4cc763c28cd1aac4eee84e6f8ae2717b5b9722c1b89a9599f3ce487580eac6780799e028f269ea1ce4a40deea SHA512 a4d517182ba1521195f46abde67e7963c7b44722b37d20a7f9afb446a1b90095deba1da9aaa940d174d5cf8dd01948619846d689e5675326b271141b355831fb
 EBUILD rdiff-backup-2.0.0.ebuild 889 BLAKE2B 0708e964f2800cd15bebc1bf24955f7734ac0a691a08ace915e048fca68a3c929053240eb7145ca677eafc7d2cb0f393695183e7846e7196331cd921fce20af0 SHA512 6e82c511c23355b00b912b65df12c73b3a91ac0541d781d0e746b745b25dea1a127e5dcb80a8cab8d57da1967fa496ca0f9fafce9318e19f9b2c0471e630bcb9
+EBUILD rdiff-backup-2.0.3.ebuild 895 BLAKE2B ca33523446e5473b0efd027c1e8a8167a5113c35aba4dab4718f86ce3cbc68da2b75a9a362d561a7d7068202ebac4d6b2955f68f1ad816e63fbb0733b0e05c88 SHA512 1e0ecbb56029e27be0d29aa4792515a5b4d07344e3242031e69ae4dea5c9586bfab3eb5fcc584c230574539495f97a66be80a172335f51304dc17713e0776ada
 MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.3-no-docs.patch
new file mode 100644
index 000000000000..7ac2e4aea213
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.3-no-docs.patch
@@ -0,0 +1,23 @@
+diff -Naur rdiff-backup-2.0.3.orig/setup.py rdiff-backup-2.0.3/setup.py
+--- rdiff-backup-2.0.3.orig/setup.py	2020-05-17 11:28:17.000000000 +0200
++++ rdiff-backup-2.0.3/setup.py	2020-05-31 00:36:19.404101919 +0200
+@@ -194,19 +194,6 @@
+     scripts=["src/rdiff-backup", "src/rdiff-backup-statistics", "src/rdiff-backup-delete"],
+     data_files=[
+         ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]),
+-        (
+-            "share/doc/rdiff-backup",
+-            [
+-                "CHANGELOG.md",
+-                "COPYING",
+-                "README.md",
+-                "docs/FAQ.md",
+-                "docs/examples.md",
+-                "docs/DEVELOP.md",
+-                "docs/Windows-README.md",
+-                "docs/Windows-DEVELOP.md",
+-            ],
+-        ),
+         ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]),
+     ],
+     # options is a hash of hash with command -> option -> value
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild
new file mode 100644
index 000000000000..61297c203a58
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
+SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=net-libs/librsync-1.0:0="
+RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=net-libs/librsync-1.0:0="
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-no-docs.patch"
+)
+
+python_install_all() {
+	local DOCS=( docs/FAQ.md )
+	use examples && DOCS+=( docs/examples.md )
+	distutils-r1_python_install_all
+}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 1bfde8ce36ea..94190fa571f0 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -4,7 +4,9 @@ AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c85
 DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
 DIST snapper-0.8.6.tar.bz2 607016 BLAKE2B 3e496fa22b1ecce2079d79caeb530ca1538febcc6bdf04aa0256e5b43bb546ea66436e60eeaae6722bc869c60579bc47c556671c5878dd671c266102516f04bb SHA512 f01a309a8dcfff455bf480ff297108e8ec3603d469d50f08740176e22bc2b8dd211de678fa8ce12c1ccd828348a35c6d347ca51b829d7b8c30b3fbaba4e9e2d9
 DIST snapper-0.8.7.tar.bz2 622381 BLAKE2B 82d1a9c91beb309e87acfa914b55b2ff5900edc023a5ecd6f2bee6b1a15adb1336656f3f1fffea4a9971aa449b7825750e6c680806d4574faada5bba0a6d14f1 SHA512 6fa63c2453f93a724f0ac23d84ff2c5aafc654463e84a4f767bb8a75a0d4fb7ca7314811179d5fefddddce0df4441298c67b473596aa720d86eeefa43011b727
+DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d
 EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
 EBUILD snapper-0.8.6.ebuild 1720 BLAKE2B b1539038deeb427fc6ca79f713d49f7122b6e1b7e795e0e96473bcdda98752f85a415e4f94f2413d1028e10786e569649122465f6d15addfc1e64ae6eca22d47 SHA512 87875741264b9e309629bff0da167c83f178b3914096ce6a6f6d91045af8d716643e0430a8a93b5c6cdbceb1e92b9df5cf6b8c21f56ea48967491cbd70a304c1
 EBUILD snapper-0.8.7.ebuild 1750 BLAKE2B db18e3f269127500ad265344f338969f385f69bd0143b1c73e61f1345e6e3acd184a15f0e21735fe53839f2f3c29547b3024ac85708bcf4212a2f0002466d898 SHA512 a7418aeb4f7666a38ee46a74d5ad1fba91a05ee16bd25d067f850e78cf9a99e9bef3ec876c45b22b1c009b0eb8ea53089f714f28f826b2d937e1e26158982f1d
+EBUILD snapper-0.8.9-r1.ebuild 1843 BLAKE2B 8d24ca268222ef6917a6f06c6d83a667c363037ae413b8139844715fb00c38e25e821be080edeeab136267718497f49c675e6b14cd15572c06458baf659a59a1 SHA512 40f4443313427b740f18ad279e8188c48295d8d6b2f38cd0fcb601d9b4f6f1f486e48b3fa1b057d1815ab3f227eb1537ce4c1f1c306256104416a5358d5a3c60
 MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
diff --git a/app-backup/snapper/snapper-0.8.9-r1.ebuild b/app-backup/snapper/snapper-0.8.9-r1.ebuild
new file mode 100644
index 000000000000..5a5593c28464
--- /dev/null
+++ b/app-backup/snapper/snapper-0.8.9-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd bash-completion-r1
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+	eautoreconf
+}
+
+src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--disable-zypp
+		--enable-rollback
+		--disable-ext4
+		--enable-btrfs
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/synology-cloud-station-backup/Manifest b/app-backup/synology-cloud-station-backup/Manifest
index d181803ec145..b481cc1cd6df 100644
--- a/app-backup/synology-cloud-station-backup/Manifest
+++ b/app-backup/synology-cloud-station-backup/Manifest
@@ -1,4 +1,4 @@
-DIST synology-cloud-station-backup-4450.i686.deb 70673598 BLAKE2B 99cba6612e778d3639439f5c59037c87bdd03f87f8c19f1f33d4ef6548341481c3326cd3c5eb97aaea9cb966bad8047d6e3f300c5cf6730a14f8b4b1822fa4cb SHA512 e2321180f9de3736e1ec7020b7dca6092cf85a90ae3fe795a6da4825e9a9989e9b6a268072d831cf8cd4f73557728f79a42c4ff86726737234c50f2503e6b93b
-DIST synology-cloud-station-backup-4450.x86_64.deb 71439298 BLAKE2B 09743a246d95e95f283575a50cead5600dc03068e19e92b8c0d965275efd9fdb633ac7be6648a97137eacb988a9bfa33d74682c8e6c582e39d7f09b608065ba2 SHA512 dda1ec9368f1292b2bdd46dec57b4f228166bf55e41acb584a2090df5158724dbb4b8aac3d62b51ffdbb0c93350f8300c14f932705e707521288cf8e2dd04448
-EBUILD synology-cloud-station-backup-4450.ebuild 1104 BLAKE2B 617da46155bb50156fdf5a04de88deab803ae0161ed2320e6e839cbecc22b0e0e36eb4773038b45c6ced91e3fff7c8f0318b60bab3938d59c99244ad0f9b8556 SHA512 c36f38aba6c801b20082546abb97b16b08b62c036eace8b6e197f3c5e0af76e32058c031abebe6ad1a598a19556e918684a9d3499ffd09fb46e74c85aec8e549
+DIST synology-cloud-station-backup-4469.i686.deb 70695418 BLAKE2B 890273fcb17f538fa83d78d4e127b8d74225d57aca43f26ba9c21da3c0d36ab7aaff7365b4540caa763ea9bdfbdee847dabcfb0ffb583d16d1d6223100d7ccf2 SHA512 1c9c346d778395fa678a99fc133d93d6f0fa2c623eb06b8164e717974a6c611197175b626cbff10bbcd2e944bc56a5bb4a168a6fc25f6603b33c5b95ac13b357
+DIST synology-cloud-station-backup-4469.x86_64.deb 71454138 BLAKE2B 6e819d0d339034db0f543d26ce42eb344da63094261a8b14edfc9e78185bcb5be283f8aebfcac61c23166c59016074df9494947efb859ea15b49536e650f2195 SHA512 19199377e82eb8cf0d429de756fd5b47ea64f70c5094263f104c186bf847cc2f95930add5f604f5a0d16680c07d55e79d26191697ff28ffbdc86c43b7d039c18
+EBUILD synology-cloud-station-backup-4469.ebuild 1121 BLAKE2B 717ad6a5ef9394ddf3a7f449925986911e86f8bbc83b7bbb4057912dab2488f402dca2f5101d2213d2db6b5fd5e4578df03cb5aaf6fbf141786cc9978b708c3e SHA512 df8fc9b5f26e8f1150eea2159c6b181e1cf2458a73a66006b28d5e4e2248e56f98f2176c06de7918b16aa4fcc31cf242b3f36ce655fffb1f05d388ed3412cb9e
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4450.ebuild b/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild
index 0e67bbf426c0..9abae19231cc 100644
--- a/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4450.ebuild
+++ b/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit xdg
 
-SVER="4.3.2"
+SVER="4.3.3"
 
 DESCRIPTION="Back up your files from multiple client computers to a centralized Synology NAS"
 HOMEPAGE="https://www.synology.com/en-global/releaseNote/CloudStationBackup"
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 RESTRICT="bindist mirror strip"
+QA_PREBUILT="*"
+
 S="${WORKDIR}"
 
 src_unpack() {