gentoo resync : 29.01.2021

19 files changed, 144 insertions, 513 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index c709238f60f9..4f9c3033a3d9 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index f6afbd144995..ee0113966a9c 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -1,5 +1,5 @@
-AUX amanda-3.3.9-stuck.patch 422 BLAKE2B e7eec8e49a61869f08ca19b913783204914c99dcb2b28465c30f5e5ac230ca3c043944f0a08477304aa7047c98846a6df113ad3daa513c11a084a2d90c13baca SHA512 8028505fd3f1946f13dae631bfd6a74f6d7688c658148a250e473ed85fd1268fae18278ede5f0499200cd84a2bc5481edb2d0f4fec2bab7a57528b9957396c42
 AUX amanda-3.5.1-fno-common.patch 428 BLAKE2B fcd2a7a2d9a6a121f81676e682606911a30b6077571e7d5aa4acb423e0a2ee50be09847566e4c38ac8a249ea729568b009a51b63ee15d53b4670653359c4f214 SHA512 66ec0c45849dcfd7ed35ace22d72f161995e80c85823eb244928862f199885f796fc7e276f14fadb1e0aace1410761e6c5f2305f8c8712fb880f80db69efa20e
+AUX amanda-3.5.1-tirpc.patch 520 BLAKE2B 9bbc1bc49c04d631920fcb1ab512e9d9343cf28fa811fd85f2911b145de853e69d0ea8c4a87986682297445243a889ab62495a825adecbbf36285a9c15f0e86c SHA512 e2ad07e598ec0de85069d93c66798a13db0a96d7b81701f8827328408b50c7581dc48b04587a0af90b77177723f4029f22b29ac5fc5414da87c264b29ddae739
 AUX amanda-amandahosts-client-2.5.1_p3-r1 343 BLAKE2B 9aca710f5a94a4acf625ecc3e78007826797dc74102a8df3f03b0113b15b9dc588a2e82192f0e3a70ffbd51e2be2597a98218c93b316382a978768cf551afa95 SHA512 7c0c4fc6d18b37ee8c11e64f98074b93f52f1bdcb97949648ced82d83ada2ea688f79531efa4c3e596f7390770540f45a7b122bba862cbd5218f1b870594f751
 AUX amanda-amandahosts-server-2.5.1_p3-r1 340 BLAKE2B 67f5de50dcf25204df2ff92b228aa76303ac69b07b31ff373fc644685f278f3e898e4e3a8e43e666ac0b64ebd61a41bb0e73db22d728a9988a93c6ea983ba29f SHA512 b11076634608c16cec4350364d60bcf3d22c12f07c0d8fab53d854e4fb21197eb016fb7f75d8153295ef9f997a3850fcd56b9fe268fa8dde5fd39d9dcbabb08b
 AUX amanda-cron 419 BLAKE2B ecfff0377fd47fb6765fd98310b1c7d16d3caccada79503f8bb6e7ae0685bd08f38f526b32be12dd5c6c7ed71b8ada4e6b6c48ebff8fdc29e08e9fcf77ea0df9 SHA512 93aa1a6bcc66bc5147210bd0dd52ae664064cc708cbe59969a5bc9e783e4972841ad7cb89f3ae111ac7695c42e1b91f727890b8e58c4f8757f08e5eae90fb505
@@ -14,8 +14,6 @@ AUX amanda.socket 107 BLAKE2B ff67fec7a3477b27ed182666dcd5f82329e57a8916ae585345
 AUX example_amanda.conf 635 BLAKE2B c02539af8d0692d8ebf80fae47979845a872bd15159616c0be84cba4c24e1f6bc9689c0cf47201fdbfd341ee5124e4b34b7c8aca3b2a8c2a9bd6fa1bc6246a7d SHA512 c025aeba89ae686a7bdc5211d9f9b52663cbf8d90fc293f8e3b7ec4b86810d0098e125f4d41bd76af4f3a451bf98b292aa062760c40efba226e15a06bb3a85a9
 AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea63691495bda0ca2db4112844c5aea60e4f8b13e668d9a9ac3707f4f52407c8639ed8cca353eac72e8ca7d9cf38dcd5 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3
 AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
-DIST amanda-3.3.9.tar.gz 4673301 BLAKE2B 8123a4f0d1fd961562a1ae6b97c2bddc4d9cb735b994c3c5f2359fa8a475a20658fc7e94c86307ab11710f23989a98c77b320e34d881b38d56a51ab0ab2f1bbd SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
-EBUILD amanda-3.3.9.ebuild 16116 BLAKE2B 9f3df218e3a1eea9710db3d9b110af828637079eb50ed1ee711afe22707681481e9dbaa61929de68ce8b4b7810a6dea215efc6f20a78970ebcb27913abe36e04 SHA512 5c8e6aca768b18d43b7fe468f1b41aacb362e70a2917b472e46e7c1a951b2e0011217fb381b51aa41e90f8db16830acecf32cc134886c3fee6641fed4447e168
-EBUILD amanda-3.5.1-r3.ebuild 15757 BLAKE2B 81a725c597a79083ee452a3a1f9847ef40c5a416cab3a3453f61a54fbb4b15344d6c297a6c6b8aef5dc76806873b04b11587f674b694afbeb05ae2151c492eb1 SHA512 48594dbdfabbf5b0c65e7a3a481a3f081a9aedf83613079ff82d32e05ebb1c461d7760aebeaa734e2ca5a123514587636fe6d0990a5d15abdd69eada3fd2117d
+EBUILD amanda-3.5.1-r3.ebuild 15838 BLAKE2B 55c63e5e44e26a834f79c9c96a8d12aa2ab6106115789786cda3e7796e22120e22a190f9f38c41e6a3822d0e2feadde8557b0e610c7940445ec2d58860f8e676 SHA512 25e9e15683e3e09f1078f6ff76b3dc70001223be2db11800f9402ff6d1172be2e8a431032c4d60a1628c51d6104f7e18f0c5c7c601d3d6b2eb103385cdf56890
 MISC metadata.xml 951 BLAKE2B 8d3f922a8e395fab343e60d31525a3faa386aebdc2b0548e37037855aab88df4b27f639672e290540bc4746024f43e2da7db853b1d9446d13744c3161a293848 SHA512 0485a881c4592e201c4130ca9bc62499a8933f77a4a4431148c647b420c022404b218896c525ab062cc40f4c386082eed25f2d38ee5bcb5cdeacc0b21c1f8230
diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
deleted file mode 100644
index 9936440e11b5..000000000000
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils perl-module user systemd toolchain-funcs
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-
-LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
-
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-RDEPEND="sys-libs/readline:=
-	virtual/awk
-	app-arch/tar
-	dev-lang/perl:=
-	app-arch/dump
-	net-misc/openssh
-	>=dev-libs/glib-2.26.0
-	nls? ( virtual/libintl )
-	s3? ( >=net-misc/curl-7.10.0 )
-	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
-	samba? ( net-fs/samba:= )
-	kerberos? ( app-crypt/mit-krb5 )
-	xfs? ( sys-fs/xfsdump )
-	!minimal? (
-		dev-perl/XML-Simple
-		virtual/mailx
-		app-arch/mt-st:=
-		sys-block/mtx
-		gnuplot? ( sci-visualization/gnuplot )
-		app-crypt/aespipe
-		app-crypt/gnupg
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	>=app-text/docbook-xsl-stylesheets-1.72.0
-	app-text/docbook-xml-dtd
-	dev-libs/libxslt
-	"
-
-MYFILESDIR="${T}/files"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${T}/${ENVDFILE}"
-
-# This is a complete list of Amanda settings that the ebuild takes from the
-# build environment. This allows users to alter the behavior of the package as
-# upstream intended, but keeping with Gentoo style. We store a copy of them in
-# /etc/env.d/97amanda during the install, so that they are preserved for future
-# installed. This variable name must not start with AMANDA_, as we do not want
-# it captured into the env file.
-ENV_SETTINGS_AMANDA="
-AMANDA_GROUP_GID AMANDA_GROUP_NAME
-AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
-AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
-AMANDA_TAR_LISTDIR AMANDA_TAR
-AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
-AMANDA_CONFIG_NAME AMANDA_TMPDIR"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# What tar to use
-	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
-
-	# Now pull in the old stuff
-	if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	amanda_variable_setup
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
-		elog "You are installing a client-only version of Amanda."
-		elog "You should set the variable \$AMANDA_SERVER to point at your"
-		elog "Amanda-tape-server, otherwise you will have to specify its name"
-		elog "when using amrecover on the client."
-		elog "For example: Use something like"
-		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
-		elog
-	fi
-
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	# we do not want the perl src_unpack
-	default_src_unpack
-}
-
-src_prepare() {
-	# gentoo bug #331111
-	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
-	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
-
-	# bug with glibc-2.16.0
-	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
-
-	eautoreconf
-
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in ${ENV_SETTINGS_AMANDA} ; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
-	done
-
-	(
-		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
-		use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
-	) > "${T}"/amandahosts
-
-	if ! use minimal; then
-		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
-			server-src/am{addclient,serverconfig}.pl || die
-	fi
-
-	epatch "${FILESDIR}"/${P}-stuck.patch
-}
-
-src_configure() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-	# fix bug #376169
-	addpredict /run/blkid
-	addpredict /etc/blkid.tab
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR} as Tar implementation."
-	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Amazon S3 support
-	myconf="${myconf} `use_enable s3 s3-device`"
-
-	# libcurl is required for S3 but otherwise optional
-	if ! use s3; then
-		myconf="${myconf} $(use_with curl libcurl)"
-	fi
-
-	# Client only, as requested in bug #127725
-	if use minimal ; then
-		myconf="${myconf} --without-server"
-	else
-		# amplot
-		myconf="${myconf} $(use_with gnuplot)"
-	fi
-
-	# IPv6 fun.
-	myconf="${myconf} `use_with ipv6`"
-	# This is to prevent the IPv6-is-working test
-	# As the test fails on binpkg build hosts with no IPv6.
-	use ipv6 && export amanda_cv_working_ipv6=yes
-
-	# I18N
-	myconf="${myconf} `use_enable nls`"
-
-	# Bug #296634: Perl location
-	perl_set_version
-	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
-
-	# Bug 296633: --disable-syntax-checks
-	# Some tests are not safe for production systems
-	myconf="${myconf} --disable-syntax-checks"
-
-	# build manpages
-	myconf="${myconf} --enable-manpage-build"
-
-	# bug #483120
-	tc-export AR
-
-	econf \
-		$(use_with readline) \
-		${myconf}
-}
-
-src_compile() {
-	# Again, do not want the perl-module src_compile
-	default_src_compile
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake DESTDIR="${D}" install
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	(
-		echo "# These settings are what was present in the environment when this"
-		echo "# Amanda was compiled.  Changing anything below this comment will"
-		echo "# have no effect on your application, but it merely exists to"
-		echo "# preserve them for your next emerge of Amanda"
-		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
-	) >> "${MYFILESDIR}/${ENVDFILE}"
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}/${ENVDFILE}"
-
-	# Lock down next section (up until docs).
-	insopts -m0640
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	if use minimal ; then
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
-	else
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
-	fi
-
-	if ! use minimal; then
-		einfo "Installing Sample Daily Cron Job for Amanda"
-		insinto /etc/cron.daily
-		newins "${MYFILESDIR}/amanda-cron" amanda
-	fi
-
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket || die
-	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-	doins "${T}/amandahosts"
-	fperms 600 /etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}/amanda-profile" .profile
-
-	insinto /etc/amanda
-	doins "${S}/example/amanda-client.conf"
-	if ! use minimal ; then
-		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
-		doins "${S}/example/amanda.conf"
-		doins "${S}/example/disklist"
-		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
-	fi
-
-	keepdir "${AMANDA_TAR_LISTDIR}"
-	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
-	keepdir "${AMANDA_TMPDIR}/dumps"
-	# Just make sure it exists for XFS to work...
-	use xfs && keepdir /var/xfsdump/inventory
-
-	local i
-	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
-		"${AMANDA_TMPDIR}" /etc/amanda; do
-		einfo "Securing directory (${i})"
-		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-	done
-	# Do NOT use -R
-	fperms 0700 \
-		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
-		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
-		 "${AMANDA_USER_HOMEDIR}/amanda" \
-		 /etc/amanda
-
-	if ! use minimal ; then
-		fperms 0700 \
-			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
-	         /etc/amanda/${AMANDA_CONFIG_NAME}
-	fi
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# Relax permissions again
-	insopts -m0644
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
-	# Amanda example configs
-	einfo "Installing example configurations"
-	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
-	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
-	docinto example1
-	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
-	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
-	newdoc "${FILESDIR}/example_global.conf" global.conf
-
-	einfo "Cleaning up dud .la files"
-	perl_set_version
-	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
-}
-
-pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
-		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-
-	# Migration of amandates from /etc to $localstatedir/amanda
-	if [ -f "${ROOT}/etc/amandates" -a \
-		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
-		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
-		einfo "A backup is also placed at /etc/amandates.orig"
-		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
-		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
-		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
-	fi
-	if [ -f "${ROOT}/etc/amandates" ]; then
-		einfo "If you have migrated safely, please delete /etc/amandates"
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "systemd-users: enable and start amanda.socket or the relevant services"
-	elog "regarding what auth method you use."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group."
-	elog
-	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
-	elog "to the 'tape' group."
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-	elog "The only exception is when you use the authentication method 'local'."
-
-	elog "Please note that this package no longer explicitly depends on"
-	elog "virtual/inetd, as it supports modes where an inetd is not needed"
-	elog "(see bug #506028 for details)."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	local le="/usr/libexec/amanda"
-	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
-		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
-		"${le}"/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
-
-# We do not want the perl-module tests.
-src_test() {
-	default_src_test
-}
diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index fe0544d23930..9498a6165145 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 DEPEND="
 	acct-group/amanda
 	acct-user/amanda
@@ -27,6 +27,7 @@ DEPEND="
 	sys-libs/readline:=
 	virtual/awk
 	kerberos? ( app-crypt/mit-krb5 )
+	ndmp? ( net-libs/libtirpc:= )
 	nls? ( virtual/libintl )
 	samba? ( net-fs/samba:= )
 	s3? ( net-misc/curl )
@@ -135,6 +136,7 @@ src_unpack() {
 
 src_prepare() {
 	default
+	use ndmp && eapply "${FILESDIR}"/${P}-tirpc.patch
 	# gentoo bug #331111
 	sed -i '/^check-local: check-perl$/d' config/automake/scripts.am || die
 	sed -i '/^check-local:/s,syntax-check,,g' perl/Makefile.am || die
diff --git a/app-backup/amanda/files/amanda-3.3.9-stuck.patch b/app-backup/amanda/files/amanda-3.3.9-stuck.patch
deleted file mode 100644
index 88892e41be3b..000000000000
--- a/app-backup/amanda/files/amanda-3.3.9-stuck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/amanda/server-src/driver.c

-+++ b/amanda/server-src/driver.c

-@@ -3957,6 +3957,8 @@

-     driver_debug(2, _("new_data: %lld\n"), (long long)new_data);

-     driver_debug(2, _("data_free: %lld\n"), (long long)data_free);

- ;

-+    tapeq_size -= data_free;

-+    tapeq_size += new_data;

-     driver_debug(2, _("tapeq_size: %lld\n"), (long long)tapeq_size);

- 

-     sched_size = runq_size + tapeq_size + dumpers_size;
\ No newline at end of file
diff --git a/app-backup/amanda/files/amanda-3.5.1-tirpc.patch b/app-backup/amanda/files/amanda-3.5.1-tirpc.patch
new file mode 100644
index 000000000000..42472b59af3a
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.1-tirpc.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/656340
+--- a/config/amanda/amanda_configure.m4
++++ b/config/amanda/amanda_configure.m4
+@@ -257,6 +257,12 @@ AMANDA_CHECK_READLINE
+ AC_CHECK_LIB(m,modf)
+ AMANDA_CHECK_LIBDL
+ AMANDA_GLIBC_BACKTRACE
++PKG_CHECK_MODULES([TIRPC],[libtirpc],[
++	CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS} -DHAVE_RPC_RPC_H"
++	LIBS="${LIBS} ${TIRPC_LIBS}"
++], [
++	AC_MSG_ERROR([libtirpc requested but library not found])
++])
+ AC_SEARCH_LIBS([shm_open], [rt], [], [
+   AC_MSG_ERROR([unable to find the shm_open() function])
+ ])
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
index cbdf13a6c90d..b10778c65e8b 100644
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@@ -1,3 +1,7 @@
 DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
+DIST backupninja-backupninja_upstream-1.2.0.tar.gz 186229 BLAKE2B dc96e10a2db2002d548f6340c807d79b258be7b02d6075450763467b2b9a1fa0c3141093c1725f3fece8efff5d5a35d3fc5deb9cb509c97068836cdd5f160049 SHA512 59c7d64136027f93c1e1fe8051d449405298e1fbb47f93db9af180a64e1356e1ee0a4f83db483c7b26c0ecd0c5a6b7cf023ab1b9bdb123ee04cb44b449442246
+DIST backupninja-backupninja_upstream-1.2.1.tar.gz 186791 BLAKE2B 2e761b5538c77f359b2cc8b8c593589303f36b5b4d4d9f65457a1786cc671bdc57ad067c5bc7678fbe1afdd17406c3dedd641f2553213ec28186defd4b9d1fd4 SHA512 974276697f908cbf2203fd0cd3ebfe4f44c350714616d3a74191df4f9e101ce6d5f90cd2887dc06c5ed937ea19f9b72db28f5735255fae9d6db4faeaacee808c
 EBUILD backupninja-1.1.0.ebuild 542 BLAKE2B cd2d70a5f52e44cd916647565a565a88fb9a9850a7a881675ab39870ae8ecc81e134682f786af97235b03591552ad701e04923fe44274d76fc014dbda5a9ff91 SHA512 3537e26e1567f887855f40e52066a8249bd8994ceb197e461b05cc49fd53e80ea51c6d2d42f6f3ed81e6c7e24ed601c49a9601258e4aa94b2d583752c9963e43
+EBUILD backupninja-1.2.0.ebuild 544 BLAKE2B 36fe14ab48fd57974e798da735d36783dc8747b1ee7ccf57ef88d1859ff527bb0f2944788401a914a450f2db919874b4d533bf56dad85671ebee108ffcde8f46 SHA512 d87450bfcb3b38430596c62c670caeab57358a8658a6711e66a47f8b9379f047fd3d12b68004aaf4c75df27ec29abf0cc45e6cfcf1da014859709aeb764b842c
+EBUILD backupninja-1.2.1.ebuild 540 BLAKE2B fc388dc02fc7dd3144a0687a8408235a576682d8bec41cb8061bf3cca2b26fe5d81adb1f2238c255e784c25257b540776e0c4ce1d575d33d81f67cda1bed08b3 SHA512 3ae5581e68196de30323654939c835b7ef3107de2390703ca70936bada4576b2dc1eefdcebe9f8c32f671775e0bf19b576acd48b2b03ed1278284821f32e76b7
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-backup/backupninja/backupninja-1.2.0.ebuild b/app-backup/backupninja/backupninja-1.2.0.ebuild
new file mode 100644
index 000000000000..5fbdc03e502c
--- /dev/null
+++ b/app-backup/backupninja/backupninja-1.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="lightweight, extensible meta-backup system"
+HOMEPAGE="https://0xacab.org/riseuplabs/backupninja"
+SRC_URI="https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/dialog"
+DEPEND=""
+
+S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
+
+src_configure() {
+	econf --localstatedir=/var #578614
+}
diff --git a/app-backup/backupninja/backupninja-1.2.1.ebuild b/app-backup/backupninja/backupninja-1.2.1.ebuild
new file mode 100644
index 000000000000..2daecb0d2abc
--- /dev/null
+++ b/app-backup/backupninja/backupninja-1.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="lightweight, extensible meta-backup system"
+HOMEPAGE="https://0xacab.org/liberate/backupninja"
+SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/dialog"
+DEPEND=""
+
+S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
+
+src_configure() {
+	econf --localstatedir=/var #578614
+}
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 7504b5dae549..cdea82ffd79d 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -7,6 +7,7 @@ AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e
 AUX 9.4.0/bacula-9.4.0-libressl26.patch 1354 BLAKE2B b5d22a50e702a239aedd803c6f390572892124370c916887b166e263f1f3aae32fede777ba580e0a32401a58dc5ce10f6d5942e8764b5bf5d3abe1b9ae7c287c SHA512 3ae42c7c4e58e8e04cb444cb07399648f6962100b9f17146385c807fd5a5890f5f5b873bb790c5918be6a97bdfb7baa980798fe04f6adffbb1648fd4fa63c1fc
 AUX 9.4.0/bacula-9.4.0-libressl27.patch 414 BLAKE2B 29c2720cd05bd5d4ddc57db61e2729744efa4ac03985995b552b2570144dbb968d7e2f91c9a8ae01fe2286483555b72b72eea5110ab364fdf6203141ee9aadd3 SHA512 8f2ea8c552c0080eb56c2e39de78779567156c8198adc2ec775fa3282b01749b8c2b113123265fee88ade2c21c5819a0d8e4c0bda6a409ee5fee2d7352e2e3d6
 AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 BLAKE2B 0fe8e289a9ef38f79d4b2dacb5503a245e5fb871771b4fce800d9196de3ccce3edf596e013ee313f19fe3f575ff4a23a1bc97decb38d4dff08e2ac38a154f610 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290
+AUX bacula-9.6.x-fix-race-condition.patch 657 BLAKE2B 8d5230145144a9ae737793b54f2075421e13fc9d391266fd2c976c867ba70806377ac9c64634a3e0ddd937d4287129e5ac1d714f891ac774f25ea41fd89c3b25 SHA512 ef8ff994c5184faa7a853321628e232242e57651a54857fb524bf24b012e39ab36d3367e2e59d4b17095140733ff6f4dcf3bb40b4a7cfb3a650edbbf2d79dc98
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
 AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f
@@ -17,7 +18,7 @@ AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516c
 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-9.6.5.ebuild 12367 BLAKE2B 80a045af37209989d6c6fcaba37a6185ab51faf737e6ccf75a911bc7fa3774a749213b332de725bd1ac3f983addf4cda2c46f549df90cc63422148c8a9e7aa99 SHA512 d49696d6a280ac96a3d478d6ea1c69980b3c056036c00a9794f3c83ffa019dc9c3ac22317260234dbcc231ac10b3e99309f6184732da41eaebb0a92076b89aec
-EBUILD bacula-9.6.6.ebuild 12370 BLAKE2B 43991de038a55b65dd3c693090f387d246acbd7d855c64e5682684a95852ccf15b87abf52a1135440a17b652689c6e090513b86df018165c9e3faf3f477798dd SHA512 ab1df73e75afc8035a7bb21707ef5cf0af3b7fc62c898c78d03e42342945fe27ce763e10d14f6b768b935925dc37447b4d5fda6c112e36e67941803e5441980d
-EBUILD bacula-9.6.7.ebuild 12370 BLAKE2B 43991de038a55b65dd3c693090f387d246acbd7d855c64e5682684a95852ccf15b87abf52a1135440a17b652689c6e090513b86df018165c9e3faf3f477798dd SHA512 ab1df73e75afc8035a7bb21707ef5cf0af3b7fc62c898c78d03e42342945fe27ce763e10d14f6b768b935925dc37447b4d5fda6c112e36e67941803e5441980d
+EBUILD bacula-9.6.5.ebuild 12502 BLAKE2B e8fca58c9aecd84da6a156a6c59584808dbdf100590bd38f41cd66bf4d67ff410404df0bac9f0966a1462e37d82258789152ae8565601b75f7b0d110766a7d64 SHA512 8ceb86a5891f6ee92876ee5d019fe22a719d60a4661caa2e664c0eb25e519fc51231f739977ed595fabb44c9a8ecf5da18a8068b90977da7f81b2a0eb5c42e23
+EBUILD bacula-9.6.6.ebuild 12505 BLAKE2B 2ef4888fa482355f3cdb74dcc9372d151754ecdf6e6da6e6850c04da66481199cca0dc7be0dfaa2ac70ce8137e79692a3312ce7894f0d721564147a6b10c784f SHA512 9242b3eb45b6908b947dfc40e33a78307dd2d3b420146628f55eb2262cdda990b7b43ee70165154b50498cc0b8755267bf57c323f6e384b5b6a99c25f7a87b55
+EBUILD bacula-9.6.7.ebuild 12505 BLAKE2B 2ef4888fa482355f3cdb74dcc9372d151754ecdf6e6da6e6850c04da66481199cca0dc7be0dfaa2ac70ce8137e79692a3312ce7894f0d721564147a6b10c784f SHA512 9242b3eb45b6908b947dfc40e33a78307dd2d3b420146628f55eb2262cdda990b7b43ee70165154b50498cc0b8755267bf57c323f6e384b5b6a99c25f7a87b55
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index d2d04673ea7d..13290a4abf99 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,6 +171,9 @@ src_prepare() {
 	# correct installation for plugins to mode 0755 (bug #725946)
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
 
+	# fix database locking code for bacula-9.6.4 ... -9.6.x (bug #766195)
+	eapply -p0 "${FILESDIR}"/${PN}-9.6.x-fix-race-condition.patch
+
 	# 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.
diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
index 8b6104a81e97..aaffa58674b0 100644
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,6 +171,9 @@ src_prepare() {
 	# correct installation for plugins to mode 0755 (bug #725946)
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
 
+	# fix database locking code for bacula-9.6.4 ... -9.6.x (bug #766195)
+	eapply -p0 "${FILESDIR}"/${PN}-9.6.x-fix-race-condition.patch
+
 	# 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.
diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
index 8b6104a81e97..aaffa58674b0 100644
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,6 +171,9 @@ src_prepare() {
 	# correct installation for plugins to mode 0755 (bug #725946)
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
 
+	# fix database locking code for bacula-9.6.4 ... -9.6.x (bug #766195)
+	eapply -p0 "${FILESDIR}"/${PN}-9.6.x-fix-race-condition.patch
+
 	# 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.
diff --git a/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch b/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch
new file mode 100644
index 000000000000..4862bcece0ef
--- /dev/null
+++ b/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch
@@ -0,0 +1,15 @@
+--- src/dird/dird.c.orig	2021-01-19 15:25:16.233573546 -0500
++++ src/dird/dird.c		2021-01-19 15:26:23.884070798 -0500
+@@ -1263,11 +1263,11 @@
+          }
+          if (catalog->db_driver) {
+            /* To copy dbdriver field into "CAT" catalog resource class (local)
+             * from dbdriver in "BDB" catalog DB Interface class (global)
+             */
+-            bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len);
++            bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len+1);
+          }
+       }
+ 
+       if (!db || !db_open_database(NULL, db)) {
+          Pmsg2(000, _("Could not open Catalog \"%s\", database \"%s\".\n"),
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 3778371470db..7434ed68dc0f 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -5,6 +5,6 @@ DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa
 EBUILD borgbackup-1.1.11-r2.ebuild 937 BLAKE2B db7291e3b72e8d0bf447a05a6af19dbdb45f4e0e28ba43bc627dfffdc465ae21cee78cbe5a34f479332fb569e3824f9e076c683dbac709097bd742d8873e8d41 SHA512 b9c15bdb08e00811c83db2abae18e59a0918f71d91c84b7403e7395ee8a4fde513cdeeea6004009ab5a86830b0a8aa93395c5018385a06f001070debeace25fc
 EBUILD borgbackup-1.1.13.ebuild 946 BLAKE2B 6ac67de6db5d118ebd0840449cd4e3eaa443590a9a36335738b93ba8e195cd075c628e25df86b6dd0d368a17d874e1ad091d356fb5a81e34046b83eb624fb7e3 SHA512 483ea58e9a0fdf94f7af9e44c8084ddcbc62fe63a3a80b1ba43ae595925ec9950e0c882cc68a37ba48bf11b3d8f17022b674e53ba151fa53c1b91d98f85b89dd
 EBUILD borgbackup-1.1.14.ebuild 946 BLAKE2B d61e7851c37fbae891967590afde2723aed7d280233bdd49cf58f22b4626b0f91360e0743759a7898ea61fe1b202b735af8ce537e5fb1907a4208cd90edf4222 SHA512 91668d078b5fa72362e3f915b6feff87d88c1e305420e927f31bea1be42d0a3a7237c4993d093250a6df1ff3243d6bd2befafb7d4f25b722ac1f9a479949697a
-EBUILD borgbackup-1.1.15.ebuild 946 BLAKE2B 6173e891ff31cf2682aaf813daab17485b0017c8585c029cc96a229b4085683021baf05d7fe46b47737f71dac8b30e7b0523b5cda3c6d2150acfbb44012aa7a7 SHA512 14e55850b506e5357c0ea423f94125355d560ed107f40d4e6fbc796cba412dfc4195582649250458b2ade2d9257ecb6ff2e2f2a0f94b7cca2b1a9c0246596c2e
+EBUILD borgbackup-1.1.15.ebuild 951 BLAKE2B 1cdbcf0958a0103c659abf689340a55e0c58981d318dfcb62bfb081106547292cd684bc0045f780517ca38edf4782b3883c8d56a5ef2731d65b16cdb2fef3438 SHA512 f8ff337f75fdda526613d25b0910dc42ada85301865866271f4b0675685b367ecd7abe049032801512d787818df418ab3c6cc33ca34ace0d03215f269c6ef51a
 EBUILD borgbackup-9999.ebuild 948 BLAKE2B d4665d6abec1ac65340e303cd953222160f680f18a9f2330c2e361d2b1f8ddd6864ad1f5785172ac065d93be3bd6b77bda3338b886091d6d3f3ebe7c2b7ab7c2 SHA512 5bc1dccda50fdc0fa760723483ea136a4f54c3c778e3d33ca1380d1f15f45b4921933dffddf7e72e89b4a1673fcd82e0e7e245a298b10155528346696c03ab65
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.15.ebuild b/app-backup/borgbackup/borgbackup-1.1.15.ebuild
index 19b329975d8b..74d30bf40008 100644
--- a/app-backup/borgbackup/borgbackup-1.1.15.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest
index cbb93d132faf..4f0c2b67ca93 100644
--- a/app-backup/zbackup/Manifest
+++ b/app-backup/zbackup/Manifest
@@ -2,5 +2,6 @@ AUX zbackup-1.4.4-tartool.patch 277 BLAKE2B 612cf1a5b6faf753829a859582ccd9cc7410
 AUX zbackup-9999-tartool.patch 283 BLAKE2B 227d8a478ab9bdb67208a493b1f06225e3ecf7a6595ba4a41be1d8647df4a7a46645421ce9dd6b7fa5f9af191bbc73ca16cce6a31ea040bd3cf9bd4065c0c142 SHA512 53724bf11c6219e494a77090de34105eb87732a6f6b671bb950ac3d86d8c188544b25e06bd49b9df00cfd471e7de976a37ec8ce60dbbc55dd4ba0d0e21e3d61c
 DIST zbackup-1.4.4.tar.gz 87118 BLAKE2B b51727dfdd756109498acbfe19c9bbe541856a5424f86e664a124cd4042f81a42cd48f14542fbf278444666ce20539fdb6571cce8aeacfcafac9a44c3ee6e789 SHA512 96f0984be71e521b2a188448bb2801996701be6e96b1dac4672cabc9f6bcb6631fdb8d03f5dde4bbdbb0050d9bd1409d468fcba15f93730d69e6c55271aba575
 EBUILD zbackup-1.4.4-r1.ebuild 773 BLAKE2B e3736ff92beb0847675549bbb6504278b06c002f3fecf005725439c8f3bedff8eb41cd3498c974e3dd4f727a5d9f78542525f619e03071bb1fe86fe8a4047c43 SHA512 992cdd5eee2c7ccf264617f6c42069db7a4eedcc33f99f0c579b6110e68e7f8188f6b7689b70dd0d027858f202a2683b892a07ba278aa9006cd91ba9439f2de9
-EBUILD zbackup-9999.ebuild 773 BLAKE2B fe7a2ed4469bf7cb0227f25c58ae05ebfcf9488588d4b346a62c95ac92cc88c5cb2361316f182e7c1b5f6b159bd0ed5dcc83b36a6239d81babbd897e08cdc194 SHA512 8e233f2acac824bbeb07b13c5a19607dfba9a9d087427e72a6b64fc9c536785ea78c9cfdbdd33eb765585eba38d37f98e98b3ab37f688a7f1b2cdd366e436017
+EBUILD zbackup-1.4.4-r2.ebuild 738 BLAKE2B 133f13eb20790b893d59ea9d18f71b38d9074eb2546f9a7bf2dda3297e7078f4148642b0273b4b4dfe64321afe9eb75cfbf3f90f73247c6d4075390e7c22cc20 SHA512 9caab4dba755b62513abc646e48831ffa0e71c440a51c27b13cf12b638e203a1d37691b021ce5b7e4e9dc71605e031efe22962e6f6b704694d200a48c29a9c7e
+EBUILD zbackup-9999.ebuild 741 BLAKE2B 7a8d5a598999d6a527dbf170ae5c83cc71650c3ddba8baac8c0749e8ac78711f94e35410c1699ecf27dcf61593c704c4132b0a17dbf78702d19a2739d11f6b28 SHA512 d08869691bd1495af5994b41acabed901aa29719c74192e8ed3e4161544ca5deb22cc26d790ec5ea62e6614b15d66baf403c97f247b685558af6fc099ffad929
 MISC metadata.xml 868 BLAKE2B 2ca9b107e5d3351ff15030e11d7da82a1b029fcdbcd24c6e0d67bd63b173fe7403c6642b11022253ba735fe70ba085c276dcfbf5dfd01e56d8c91be8144ee82d SHA512 d452d2e94449e05f0d2f99d223587560380999c7afd1396e3c7e3ed8a3792d4abd0bb717d078053cec0cd397df4cb2cf00949b24ab407fc966705bfe6911b524
diff --git a/app-backup/zbackup/zbackup-1.4.4-r2.ebuild b/app-backup/zbackup/zbackup-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..94426b77ed33
--- /dev/null
+++ b/app-backup/zbackup/zbackup-1.4.4-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A versatile deduplicating backup tool"
+HOMEPAGE="https://github.com/zbackup/zbackup"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl tartool"
+
+DEPEND="app-arch/lzma
+	dev-libs/lzo:2
+	dev-libs/protobuf:0=
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+# Add tartool build
+PATCHES=( "${FILESDIR}/${P}-tartool.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TARTOOL="$(usex tartool)"
+	)
+
+	cmake_src_configure
+}
diff --git a/app-backup/zbackup/zbackup-9999.ebuild b/app-backup/zbackup/zbackup-9999.ebuild
index 864251576a57..3a15bb4c1138 100644
--- a/app-backup/zbackup/zbackup-9999.ebuild
+++ b/app-backup/zbackup/zbackup-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="A versatile deduplicating backup tool"
-HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup"
+HOMEPAGE="https://github.com/zbackup/zbackup"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS=""
 SLOT="0"
+KEYWORDS=""
 IUSE="libressl tartool"
 
 DEPEND="app-arch/lzma
 	dev-libs/lzo:2
 	dev-libs/protobuf:0=
-	sys-libs/libunwind:0
+	sys-libs/libunwind:=
 	sys-libs/zlib
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
@@ -32,5 +32,5 @@ src_configure() {
 		-DBUILD_TARTOOL="$(usex tartool)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }