gentoo resync : 06.04.2022

9 files changed, 3 insertions, 1778 deletions

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 2d03b9905413..4909728ef91e 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,12 +1,9 @@
 AUX 5.2.3/bacula-5.2.3-as-needed.patch 765 BLAKE2B be4e29d48974afd31894535dc89c51094f50344609ed1525c46d39a600778df5b458ce5587500a3455cb6e4b601c24dfdd567ad1cd264d108b9852d34e47e64e SHA512 5e303c5c53d6cef8e875d32811d23a9b6f354c394a6dce11646ad3f4c827b03cf1bd3c0267ff8873e1a176eb0b33314b712d8c9dc3c4c4ba24306d80b3bae4c7
 AUX 5.2.3/bacula-5.2.3-openssl-1.patch 863 BLAKE2B 32d49a53c8f639e762bd964f4fa1426952ccb2fd595717e015ee9c060e182d9189cf1749cb5e9d90d8712a0b1c3800ad98ba175e48935e7b6d172e6474719456 SHA512 729f01b5e88230561482cbe87fd185707be28ba92252e54a5111f0154f7d3df9cec9e31ee932bbdb34fe8b5e212cf43dc74d46460f68579e5f953ffe565a7a2c
-AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a04998856ab6743e5f3577e9e316346a22eed45a02960ed8590c946e079ba1e9d814061f67d6ef25c0a72f8bcafe38a48e SHA512 0474e077d89c5b1552f8b1929209db380ac67ca29add78987ad1593b139647a2d1822a0d89c3b117ca93024bffd74da7da5a5f23bc5095492c0cc9e4eddb24f6
 AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34
 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
 AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f
@@ -14,16 +11,8 @@ 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-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540
 DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
-DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
-DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
-DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d
-EBUILD bacula-11.0.2.ebuild 11886 BLAKE2B 9b75fcb4f5a5251e9428e5406b64c4d16691f250df5e8a73464a6fad0d1e8dd92114f9f304e9761c2dc01a71abccb7ca4cec33a6544d63fcbb72c53fae87b332 SHA512 198760cb7179adc14c740d4e26274acf543041fa7fc4992f8560ae4222a71e37f2ff20134ebf9d4009598e894a213c935af878b728c2eb7436664f29bde61614
-EBUILD bacula-11.0.3.ebuild 11791 BLAKE2B 52f1c30b3ed65336004dfcb3defcc1f40ab13fcff9448e2309835177ec953849f38b7b8ed417d2796c03075d7bdcd07c955f756cbb262d08528edbf716eff73f SHA512 deb47dc53d3bd187122aac3ae8c6eb0d206ae85776b838881d7cd27ca2c1d6eba029d435085e40188d7e033497d6bf027ad398ba495ffb3e875167a72581521c
+DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
 EBUILD bacula-11.0.5.ebuild 11789 BLAKE2B 24d06c8bbd5f9dc53514d268f8c7a26548053c072360adbb1c7e26f51bf5313252fbc37cc3100b2bf9a0e4da27d28a76049ed42b3fc1d584798a69c8ec7e0960 SHA512 55557589d37717e3cd20e8a096bb110eb92a6ac87114508a52d284a1225ecd543a1004e8b52a2bb8d3665a10aee4ee171168811ff8e7ca64d0db3ca6d25aa291
-EBUILD bacula-9.6.5.ebuild 12034 BLAKE2B 2ac2577e6b9ba0f9d38f7f830f8589eeb5146a77fa90de5f5109d5cd17cbf3a828e6938e33c201f10414f4ed234ba6770627400e80e10d4300e11b0f79b0bee6 SHA512 f37bfa3d7e575705da46b4f76325e37641c343762ee53a678a026731a000833b0fcff893d6dd60ddda3e545f3f99390ebcb89b51df557bdbaaeef7460e01e426
-EBUILD bacula-9.6.6.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
-EBUILD bacula-9.6.7.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
+EBUILD bacula-11.0.6.ebuild 11791 BLAKE2B 911f6f854ecf518e0fe87eef7d4f8ce5d11c29288b044321e0db2d39f97b666e9b81de48a066a2fc5b76a3f921ad575891f7ab126cc6265e16040714e99f108f SHA512 0b06c0bd480be35dd0ec861bae349660877bf646bf593f724ede70681b9246cf9afdd7ba86057101aa1c2a77c7fa4efbf250e1f162f309b3409fe43fb5385c47
 MISC metadata.xml 697 BLAKE2B 6fd293a1009c2d461a43d404eff2883443f4e2a49d862120f4c9477f7fae8f2462be4786a7e8f6216515373e881d071b433835b9fb8da3b2f30c0701ef4a7ced SHA512 6d0077158112c26232370f11ec0d00ccb14376ce2649cc8ef79d3f99332bbe1bf18968a42e9c20d82934be3f9b49d49cf1f848e4e837143f8a5914fade6b14f7
diff --git a/app-backup/bacula/bacula-11.0.2.ebuild b/app-backup/bacula/bacula-11.0.2.ebuild
deleted file mode 100644
index 129e789ee79d..000000000000
--- a/app-backup/bacula/bacula-11.0.2.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# 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-11.0.3.ebuild b/app-backup/bacula/bacula-11.0.6.ebuild
index b2738be8a8a5..280ae3cb775c 100644
--- a/app-backup/bacula/bacula-11.0.3.ebuild
+++ b/app-backup/bacula/bacula-11.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
deleted file mode 100644
index f5260ccb5e3e..000000000000
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2022 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}"/9.6.3/${PN}-9.6.3-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
-
-	# 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 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.
-	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.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
deleted file mode 100644
index 83f72ca31788..000000000000
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# 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}"/9.6.3/${PN}-9.6.3-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
-
-	# 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 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.
-	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.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
deleted file mode 100644
index 83f72ca31788..000000000000
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# 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}"/9.6.3/${PN}-9.6.3-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
-
-	# 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 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.
-	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/files/7.0.2/bacula-7.0.2-depend.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
deleted file mode 100644
index e076cd6478cc..000000000000
--- a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix file not found error during make depend
---- src/tools/Makefile.in.orig	2012-09-20 20:42:54.000000000 +0200
-+++ src/tools/Makefile.in	2012-09-20 20:35:46.000000000 +0200
-@@ -194,7 +194,7 @@
- 	@$(MV) Makefile Makefile.bak
- 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
- 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
--	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
-+	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
- 	@if test -f Makefile ; then \
- 	    $(RMF) Makefile.bak; \
- 	else \
diff --git a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch b/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch
deleted file mode 100644
index 1f32cd224f01..000000000000
--- a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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.a ../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/bacula/files/bacula-9.6.x-fix-race-condition.patch b/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch
deleted file mode 100644
index 4862bcece0ef..000000000000
--- a/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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"),