gentoo resync : 22.05.2021

16 files changed, 586 insertions, 65 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index cb3bb917fed8..1ac34079a00e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index c990a8d8e450..496a57f61298 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -5,6 +5,7 @@ AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59b
 AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d
 AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf
 AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 BLAKE2B 0fe8e289a9ef38f79d4b2dacb5503a245e5fb871771b4fce800d9196de3ccce3edf596e013ee313f19fe3f575ff4a23a1bc97decb38d4dff08e2ac38a154f610 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290
+AUX bacula-11.0.2-fix-static.patch 3752 BLAKE2B c910fa044c79f0f50abf5ac86b9f34489cd1bab599394449ec8cf27d2dbb65c36bed77fec80dfccc28c0b1b27bfaafee4127fdf90e77d044a2fed7351973f432 SHA512 63505e9c571b5fd034754da87052441f8438ca0efe4511406eaf142891bd09128c8e478c536f114c4823c53c9f09995bd734dc7efe3e10bdfda337d78c4667bd
 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
@@ -13,10 +14,12 @@ AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df
 AUX newscripts/bacula-dir.initd 315 BLAKE2B e2bbd011773307a24044a761f17ec7079e5c7cdbac074d7fc064be554bd346fce2d257a789b6b8126eb20460bc7ea80afbdb691dfc012461d6aa1eb14298e8ce SHA512 cbb52bb584e8639a12930491bb5fdd88c279e3ac79a2460c1ceb5d2b9ca4cd4b4fb5be460b8a366ba21d2056befedcc6298468834648d47a5daac814733685f9
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
+DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c
 DIST bacula-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 12072 BLAKE2B 4e8db8adee0c9a29ffbbb873cf8089b0291e693b0f461339d376a0c1e18c5fd0cff9c06569d492f5e08562dd7d7d8372639dd2b27cd8b700f2fcc29dac8d34c8 SHA512 8b2ee720023b762944690b51fc504e00a9cc61ea6bdc57efbf6afeebe625c9ed076765f744fc6a03fc46386bc61bb3de50db65defefa136a4f89f5dee56ca8db
-EBUILD bacula-9.6.6.ebuild 12075 BLAKE2B 51314b17c6a5f8ee40266f651f5c76c826bab5860977e2392eed9cf48ec7e2d9c6867ae128710757522edf0b935233cef06b841aaeb5645b31351470a5773f57 SHA512 2f7ebbd951410ae5d1cfd0dabf6476365170962de4b4179144f697fd44770543f2af82c729b246c51d21ab3b6e5a16c25ffda2dfb2aea36cd07c4a4d82789908
-EBUILD bacula-9.6.7.ebuild 12075 BLAKE2B 51314b17c6a5f8ee40266f651f5c76c826bab5860977e2392eed9cf48ec7e2d9c6867ae128710757522edf0b935233cef06b841aaeb5645b31351470a5773f57 SHA512 2f7ebbd951410ae5d1cfd0dabf6476365170962de4b4179144f697fd44770543f2af82c729b246c51d21ab3b6e5a16c25ffda2dfb2aea36cd07c4a4d82789908
+EBUILD bacula-11.0.2.ebuild 11886 BLAKE2B 9b75fcb4f5a5251e9428e5406b64c4d16691f250df5e8a73464a6fad0d1e8dd92114f9f304e9761c2dc01a71abccb7ca4cec33a6544d63fcbb72c53fae87b332 SHA512 198760cb7179adc14c740d4e26274acf543041fa7fc4992f8560ae4222a71e37f2ff20134ebf9d4009598e894a213c935af878b728c2eb7436664f29bde61614
+EBUILD bacula-9.6.5.ebuild 12033 BLAKE2B 2abae986e8bdb9e358be317b619a3be15b18fdb2ad93d00d160c9acfeec3b7ee7e5b55e54be8f85ea2edf5ee8cfbd2df7ce5aa5d599fd543c8e7df0d69c7447b SHA512 5135d97f296e93343a2661d32bb76e6a21da25c2da3f858516a9affffd8831516c7f12adbe607afa68d675bef8dbbed2dff23b594437d0ac3d77fb999af308f2
+EBUILD bacula-9.6.6.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
+EBUILD bacula-9.6.7.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-11.0.2.ebuild b/app-backup/bacula/bacula-11.0.2.ebuild
new file mode 100644
index 000000000000..129e789ee79d
--- /dev/null
+++ b/app-backup/bacula/bacula-11.0.2.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${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
+	# drop not needed tool
+	rm src/tools/bsparse.c || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index d9cbcaee1838..033903ff748f 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -201,7 +201,6 @@ src_configure() {
 		$(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) \
diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
index d527ca5224e4..83f72ca31788 100644
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -201,7 +201,6 @@ src_configure() {
 		$(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) \
diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
index d527ca5224e4..83f72ca31788 100644
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -201,7 +201,6 @@ src_configure() {
 		$(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) \
diff --git a/app-backup/bacula/files/bacula-11.0.2-fix-static.patch b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
new file mode 100644
index 000000000000..f7ffccf0fe58
--- /dev/null
+++ b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
@@ -0,0 +1,63 @@
+--- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
++++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
+@@ -24,6 +24,7 @@
+ CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
+ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
+ JSONOBJS = bbconsjson.o console_conf.o
++ZLIBS=@ZLIBS@
+ 
+ # these are the objects that are changed by the .configure process
+ EXTRAOBJS = @OBJLIST@
+@@ -50,18 +51,18 @@
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 	strip $@
+ 
+ 
+--- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
++++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
+@@ -69,19 +69,19 @@
+ bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
+ 
+ bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 	strip $@
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/cdbkup/Manifest b/app-backup/cdbkup/Manifest
index 63c9566b2750..824cb7360f83 100644
--- a/app-backup/cdbkup/Manifest
+++ b/app-backup/cdbkup/Manifest
@@ -1,3 +1,3 @@
 DIST cdbkup-1.0.tar.gz 38252 BLAKE2B f16209fac8a4c64b628caf9770c67e944add326a7aeeec0b76a1018b8441fd7cfd92de1a657eb8efe0eb49f30fb3f0e135f090291d8c07da1fef313a81f4b0ab SHA512 f95a7540704c16a01e65397fb63b5b97011685c62d3c9a9b2e303470fed5a31f909cb700035466e89ccd181401fd3c19d427fa32c40ece1ba77c1dba9322969d
-EBUILD cdbkup-1.0-r2.ebuild 710 BLAKE2B 5621a7e85b63ed277e10586b6a99cbcc13d7ee500331c0b2b61cb770750ee6586202d27feb6eb7a9899b90955df3679177cd5206b92949d46763093d5c6ad934 SHA512 b33475e857a6d5081051fe24fb6e726de3cb940eadbb8bf0dfc0e0ca5e28ef7f9e3cfad53fb9a1398e8fa139ed367b9ec064bc42ac9ad6ff507cf5ceaa7d61e9
+EBUILD cdbkup-1.0-r3.ebuild 716 BLAKE2B a678c1d19e60283ae41203ddff6f1ed11cd34a2d815b452d2d1000327bd79d90f0a473477da535b364a5daf050b3db56068dbfaf5bfaefc709d2d767c38a42a5 SHA512 3778744558ae6031e01a59707cc4f340b94c96c2fd4b7d059551c91abe22167a6b9f93758db7d558e012356c9ae285e391a242fb838ce298f1ca2ef6f994c9f0
 MISC metadata.xml 392 BLAKE2B d840db592ea3cc9fe268652b9fe71d4fb5ce2637e4d0b97d1329d3e389678775677a530de9a31c76b0fd61667964d0a7899b899fa3d39d01b5ce39f2c4910c65 SHA512 12309a51f3fd6a5fe322a90d71cb554c07b1dcbe42aa5052f3b84f9e361dce74e90bf4915852b7d7d563488451f4e6148a9fc24bb7ef539178f4abc8f0805ff8
diff --git a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild b/app-backup/cdbkup/cdbkup-1.0-r3.ebuild
index 82f0538a7ffb..2f203321b536 100644
--- a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0-r3.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=6
@@ -15,7 +15,7 @@ IUSE=""
 DEPEND="
 	app-cdr/cdrtools
 	net-misc/openssh
-	virtual/eject
+	sys-apps/util-linux
 "
 RDEPEND="${DEPEND}
 	!app-misc/cdcat
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 72c766d3a5d7..14c3a7ca4a7c 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,7 @@
 DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
 DIST dar-2.6.14.tar.gz 2148023 BLAKE2B 36653d798d1da9cd87e84d2301b9f1fd657e92d1eee91ec1efadb54e94638860103c5e509479a2da846d432328e0a93ae92e1a4d23b6956ca55341ef767fe9a8 SHA512 2b116929fcc192ffee0c266959902b45dc9982ba77e017b3217715e0c63d1574d64083ca55a63e0bb6390e8955c41ca8b09da63934826fe4f0471a63ea739550
+DIST dar-2.7.0.tar.gz 2285856 BLAKE2B 194e9fe2345bdccdb053996b109fe4efb886e23b69d440f7ac2b545c1ce2f241c7f24c56d7b68bde904b8e1a85df20716b63068a6c471c71a7569921eb06aa1f SHA512 0e207c244f6700860a84217069774162b7b56c95e5c0955813fbd96d37a3fe1fa126cab05bab0a21b3e9eab335c10961daf243024fdc35f6276468bd549d49cb
 EBUILD dar-2.6.13.ebuild 2421 BLAKE2B a16560b5fa34dafd05fcfe917b6739ffd8910d5284cba9dc28c343ba6e92f43704d2ac4e290f03be7426cd0896d371cd2ab7c648a85a5e05327800cb5f8edf99 SHA512 76dff2090770e07c49171176d149b42e5cd331e729fc054e4509598f5b5d26745de3a727d65af103cc72ed94abf103fe7be61b1c60ebab58f94688371588f525
 EBUILD dar-2.6.14.ebuild 2146 BLAKE2B 5095a9a2518b778578cd188db5dbd7ec3aa721da28742241e7b1688bd241ab63aead52082492ae4c6a60999f8f6235245204c66c3ac1dfbd6e8bca60528a09d1 SHA512 ae419297e74e0e5580905c6466e0506086c6b32c571c1b8541e5c894dc1aa3dd637308a00c859f8877ce5d04d0084410b6932370c9bc480175d3a6d72e2293cd
-MISC metadata.xml 1187 BLAKE2B 63ef76c44a9792d83529247af4afb722f9d5de63ab29344ecf55c827dd4e4c20b4dbcc02a6e2e71b6aa33c14cd03f2b14d9cb90000ae47dbde89479b67c1e8a0 SHA512 39eb6ec5774043f23c68916cfeed74d0c2dcf4a6471b70610e5896687a866624dcebd2b0e2050d9850057d2844eae687b7c30338bd82c9acf63ab297e7473c5e
+EBUILD dar-2.7.0.ebuild 2231 BLAKE2B 6b82ed3c1965219f6ef8cdb9db16358f218c584558116be2a5fbf09d62acf8b66340fd56ec44d3a29fb6b5f55324a81fdac14cb6fea54c85448164fac9d9e07f SHA512 84345f585a602e3b4c6db67a8862df0b2a709be4ca2fe5341c55687e009b61d13c1efb99dc8ff92aa7692c29656fea96a58e987740bedce245278fc02fae3f03
+MISC metadata.xml 1283 BLAKE2B c8686b55e5aab51bc28ace7dbc34af0e40b3b593d2fa8a5a27b746b4e14382b9762593cc9094c8e44bd98fac91eeff1bdce611210991230da6b5ec896e66626c SHA512 592dd28dfbb3dedfb2a7f731893f50e64d08aed3d8cc7aeb15a5d7e382c777d94e8c6b984e4aeeb7c73705a473bd5ae0d885d08b19bcc9370458e0891741d942
diff --git a/app-backup/dar/dar-2.7.0.ebuild b/app-backup/dar/dar-2.7.0.ebuild
new file mode 100644
index 000000000000..0b4d6b7ae696
--- /dev/null
+++ b/app-backup/dar/dar-2.7.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	sys-libs/libcap
+	>=sys-libs/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2 )
+	curl? ( net-misc/curl )
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	gpg? ( app-crypt/gpgme )
+	lzo? ( dev-libs/lzo:= )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar:= )
+	xattr? ( sys-apps/attr:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+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-dar-static
+		--disable-python-binding
+		--disable-static
+		--disable-upx
+		$(usex argon2 '' --disable-libargon2-linking)
+		$(usex curl '' --disable-libcurl-linking)
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		$(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 threads '' --disable-threadar)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}
diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml
index b601da091bec..2715a3d89764 100644
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@@ -16,6 +16,7 @@ compression, ATTR/ACL support. DAR also supports Pipes for remote
 operations, including with ssh.
 	</longdescription>
 	<use>
+		<flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
 		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
 		by 32 bit integers</flag>
 		<flag name="dar64">Enables --enable-mode=64 option, which replace infinite
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index c585d0be65b6..2e946d5801c7 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1,5 +1,3 @@
-DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff
 DIST fsarchiver-0.8.6.tar.gz 273652 BLAKE2B 2f8d11bb721c4e5452f0bc62661bd254226d3d62b5d7bee0a8ccfd227bdc39dd0dd544e831888bbf39010341aaa0d74b2805ab580c79cc90e96a43be1676d86c SHA512 26a2d7a68d162aabb778b14f29c52cf8fbadb8147cf5eae592352a36fbf93cc45c08c241253bd8dfe8cd0b77d0f156afcc8d89e8d24a238fd4427cb479827f14
-EBUILD fsarchiver-0.8.5-r1.ebuild 1135 BLAKE2B fcfa6ddeee0d975f57a7adc5c957f80365a1b50408729bb13dc39f447df4e3f8386b157a743e011eaf0dc23336b270210f9c64e70a92789ff137b7615759e8e6 SHA512 b1e0febbdae240580c75a8138ece1997fdd561e26c321545d98a4a526314f348c766f9bdffdad3a5ad8f2e03f8bb16866eb33194f8aafdd74fb6a64e679ec31b
 EBUILD fsarchiver-0.8.6.ebuild 1384 BLAKE2B 1f842f6c2352712dfbd3e2545f6b304af1b65a12fa5b5c9c70500a495fcb26b164b9dd0c266508c6ac839c3fda0e8e1ac17bc6a49cecf382dd3cc7d5072079f8 SHA512 f66fb5975e4333ebdd5598848bc4d2810a5e6c62a34bd3395d2960a531e01e18c4cd093d2070c4619e0a4c31dbb0ec4e1558f39e8049a624ac8bb9d0764418fa
 MISC metadata.xml 382 BLAKE2B 891eee8fe94ac34a54fea42dbfe6ae6f136fce28cfd45e400d16d7aac3c163e41d92100d035657cc0ca3d2f3d4698a457a28f515af56cfbcb3cc06c33782060e SHA512 b7ec7dabd9c51139e7d669bac569eefcd460b880db50247f888c14be332d679fbd680c093dd7a04a3e91f75385772552af7d0f4398106ca753ca8e261154bb41
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.5-r1.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.5-r1.ebuild
deleted file mode 100644
index 625ecf821296..000000000000
--- a/app-backup/fsarchiver/fsarchiver-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
-HOMEPAGE="https://www.fsarchiver.org"
-SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug lz4 lzma lzo static zstd"
-
-CDEPEND="dev-libs/libgcrypt:0=
-	>=sys-fs/e2fsprogs-1.41.4
-	lz4? ( app-arch/lz4 )
-	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
-	lzo? ( >=dev-libs/lzo-2.02 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	static? (
-		lz4? ( app-arch/lz4[static-libs] )
-		lzma? ( app-arch/xz-utils[static-libs] )
-		lzo? ( dev-libs/lzo[static-libs] )
-		zstd? ( app-arch/zstd[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
-		|| die "seding failed"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug devel)
-		$(use_enable lz4)
-		$(use_enable lzma)
-		$(use_enable lzo)
-		$(use_enable static)
-		$(use_enable zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest
index e39292278cb0..ba336e24ae7b 100644
--- a/app-backup/kup/Manifest
+++ b/app-backup/kup/Manifest
@@ -1,3 +1,3 @@
 DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8
-EBUILD kup-0.8.0.ebuild 957 BLAKE2B 7567e12479e0295d23732fb9994c0e2d4360b904e54323a2a9bb119b4e9840682b959a1a3da94b6cb4a74e8b01cbaeaeea006eec4a7bfc407ec193a8d7fa6f2a SHA512 cd87434708bd427325d4a32f67a86ef861512f49a82f89a11a6b8384ad3a640d08304609310d7b0064a35073ab770ecaf4917715c350578ec46a8ba6f38eee84
+EBUILD kup-0.8.0.ebuild 955 BLAKE2B a236e1fcdf7fa2cd318b75ee976bbc812000512269347554b1dbdd3a2c95cd97f425810588dd3667beefe44a916495b92b5a894b150f04a0b0764dc0a03f4cdc SHA512 0f7bd01aa4848ce8c42ece33632c9c3f56d018c9f38c4844520ed3446ccf1a37cc5eada9ccd6e04c560ff5405be93212d4cf630667c481415b1d764fea162be3
 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
index 3964f977082b..433744b3008d 100644
--- a/app-backup/kup/kup-0.8.0.ebuild
+++ b/app-backup/kup/kup-0.8.0.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
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 inherit ecm kde.org
 
 DESCRIPTION="Backup scheduler for the Plasma desktop"
-HOMEPAGE="https://apps.kde.org/en/kup"
+HOMEPAGE="https://apps.kde.org/kup/"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"