diff --git a/app-arch/libzim/Manifest b/app-arch/libzim/Manifest
index 1140947b..e03bda0d 100644
--- a/app-arch/libzim/Manifest
+++ b/app-arch/libzim/Manifest
@@ -1,2 +1,2 @@
-DIST libzim-6.3.0.tar.gz 28664137 SHA256 984d2f3881c507c9f0212dc2bc1b808d25cdeef6a62043f9211fcb78a231a986 SHA512 822e293bb1dc376256063326951571b705e5735132a137f5966d0f6ed0bb8c8289765680503b449c271ffce7e771da1f304d9ab9455cfc968a2d9943a5955090 WHIRLPOOL 199699446590f4c6e748a7be9035e2cc2ac13a7c2251169b38f990f83d488f0502ad1b513a1012863ef3057aff951ac1ef1586a4366f6c61cde88bc7b3402539
-EBUILD libzim-6.3.0.ebuild 452 SHA256 1ef50823be43ec1da4afec32963d74d91d9bccb8810d68d791de77f97ec7e5c6 SHA512 76628dab8477506541e157886f1c1964dc0aaf32f63d1567d053c65dc57c565f54b92667620f57628241d4e0cfd3a8b8636d79f0c5cf40cb92672b392bc550cc WHIRLPOOL 579cd51a5abc3cc2229826da5633262a27b2f3a4d24ef570a91685b33e878378ae1b1d068a574d66e6cf703787f8dad3707f012ac72ea33b7a8fa8020bcf6ef7
+DIST libzim-8.0.0.tar.gz 233841 SHA256 a408810c9316b56b410f6878a488f7d821c9b7eb3983e0114a4ab1a50394f7d2 SHA512 28d3053e55c0562852694acc1bde7fd4511ab375c64b4db77544ef7654c14acaf3715daa88aadd4caeebba386168c45264dbf5a50770ff799a26e2b5fb400769 WHIRLPOOL 1af55bfe610e325228dcbf1927a20facaf34726c75c72dd4203492b9813073be6d4e5458f2ff3773a5db0423ad5b432f56e84198a4cb3e107866c30700a1fd64
+EBUILD libzim-8.0.0.ebuild 452 SHA256 1ef50823be43ec1da4afec32963d74d91d9bccb8810d68d791de77f97ec7e5c6 SHA512 76628dab8477506541e157886f1c1964dc0aaf32f63d1567d053c65dc57c565f54b92667620f57628241d4e0cfd3a8b8636d79f0c5cf40cb92672b392bc550cc WHIRLPOOL 579cd51a5abc3cc2229826da5633262a27b2f3a4d24ef570a91685b33e878378ae1b1d068a574d66e6cf703787f8dad3707f012ac72ea33b7a8fa8020bcf6ef7
diff --git a/app-arch/libzim/libzim-6.3.0.ebuild b/app-arch/libzim/libzim-8.0.0.ebuild
similarity index 100%
rename from app-arch/libzim/libzim-6.3.0.ebuild
rename to app-arch/libzim/libzim-8.0.0.ebuild
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
deleted file mode 100644
index 23bbda5b..00000000
--- a/app-backup/bacula/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX 5.2.3/bacula-5.2.3-as-needed.patch 765 SHA256 addf9c8054f505e72e840dc99166ebf5819b2f8c720b8dc1a6bda3fe44ad5c26 SHA512 5e303c5c53d6cef8e875d32811d23a9b6f354c394a6dce11646ad3f4c827b03cf1bd3c0267ff8873e1a176eb0b33314b712d8c9dc3c4c4ba24306d80b3bae4c7 WHIRLPOOL 865d59bb21ec09b91b8c86b52335308b7672b70776979e6866f5bc8848454ea7af020a24773590dee8918172bff5bea32ecb2932ed9709178aab37699e97f771
-AUX 5.2.3/bacula-5.2.3-openssl-1.patch 863 SHA256 95f3074b393bb340b1e82c206ec5daaec86d2998c04038a2dce356a2e5e2c1e7 SHA512 729f01b5e88230561482cbe87fd185707be28ba92252e54a5111f0154f7d3df9cec9e31ee932bbdb34fe8b5e212cf43dc74d46460f68579e5f953ffe565a7a2c WHIRLPOOL 7cfa223e11fa7f8790d2eef3b3c585c4c4917000bc7a0cd2707d4ae5c555322c480a9c85b908deaa990882e7305909a8269ca3b7ab6c24a3badb29e7ed747bbc
-AUX 7.0.2/bacula-7.0.2-depend.patch 599 SHA256 e446f056f7e91cf3efbcdef1b8d6125dd53e2912c9f479181b327f275cfa753a SHA512 0474e077d89c5b1552f8b1929209db380ac67ca29add78987ad1593b139647a2d1822a0d89c3b117ca93024bffd74da7da5a5f23bc5095492c0cc9e4eddb24f6 WHIRLPOOL cba7765a871cbae363fd6aed2ea920573b4452f57c5fed39c89bedddaf4509ad6b8d13d77eecbeb8a404b027cb1103eeda074e9ce0b78ef9a9bab02774cee718
-AUX 7.2.0/bacula-7.2.0-doc.patch 435 SHA256 ee511b39024b62e5ec8a25b33609242f925c98ec0abb57e098d07d58aaf41135 SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34 WHIRLPOOL 748a6d5b476910e533e59076c9112e3dfbc10b55748c2848843ca490a02ebfc7418fddf1ace9b0331ab19d41ae31d56eb4e1df147e4edf119cf9be094faeed1b
-AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 SHA256 a3322fa346700ac2d7e8f757b017330f58b9370eced21040349bba53e5e6aa85 SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d WHIRLPOOL ba239564d0e0c203ebb79065bc09d1c94ee834dd34de31b1bc080030537a4ed2916912d4875aaabb650bc71138fcfb806516892187bce3d3cfe733dd23e3875f
-AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 SHA256 3c3b0f8a34eace2984cad52da21058e7c1baa7e0a1b82e8528e15760f5596698 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf WHIRLPOOL cea7b0e94558e260b1f22006f66b6eae16ff55a9445e7b521f5e18aaa2d8e594f3cb51d70159e105128ef31af20ba548798b336a392916dedb2769ea3ab05fee
-AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 SHA256 533bb42a373e64d8199a96c11993dc7949507b87a7475211e60ee3420c19d3c8 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290 WHIRLPOOL a3d92b38454ac0c50784cd9e2f0689cf19debe8014a1abed0f0f405fda0d518f42ff0991789a3794bc7ffd16cd3f5e1e3a6a74e479f40720674292652ca4343e
-AUX bacula-11.0.2-fix-static.patch 3752 SHA256 75752ecfa06c005813499f4d315f5247433efee1f0ab89297bee6d08f92ffea3 SHA512 63505e9c571b5fd034754da87052441f8438ca0efe4511406eaf142891bd09128c8e478c536f114c4823c53c9f09995bd734dc7efe3e10bdfda337d78c4667bd WHIRLPOOL 5aa8824c310a0aab21058b9c3ae43c421974e8efcb004cc34dda70f3480b5f3b7d6ffa1a57a20dc3c60d881cfe0071f2ffb811ac281631f1be936a6ff6d27e49
-AUX bacula-9.6.x-fix-race-condition.patch 657 SHA256 0836ea809d5499c8929b917d95e48dae2d749a359ac98d814126681dfbb90edb SHA512 ef8ff994c5184faa7a853321628e232242e57651a54857fb524bf24b012e39ab36d3367e2e59d4b17095140733ff6f4dcf3bb40b4a7cfb3a650edbbf2d79dc98 WHIRLPOOL 6fd0721dac6b888bca2446fc8fa0a387eb8b97f2cd08caa9c8b4d2d5bcfb7470a5b4b2b160f0e9519e44698392d88c6de78aceaba20a806bdebe4c3fa4920c48
-AUX bacula-dir.confd 629 SHA256 34e00cbda7cb94da785fef529ac180f1bc2db63537269f5532ac181c2d0d60b3 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf WHIRLPOOL 833143b278f145415916dfdc3f708a33a92ba76aed1dec1b2ced5c94485fa5b06f00d63b0bff5b442c68aa89af38de957f699ca18d5585005294a169665ce675
-AUX bacula-fd.confd 241 SHA256 82939d9f6adeb680f8195c0acf8e6390d1502533fdd1a38b6d9426b806510a6f SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f WHIRLPOOL 6a35351a5a635b1f815a648ff83cde83d300c575ad14b9bd6f5e6b7d40db8d9613e7c13652a56dfafd4b50206f76a03e0595807490aba23bbfe21853ac33c5d5
-AUX bacula-fix-sonames.patch 1041 SHA256 49dc13258f8af7a5e4df0393672cf5b1b8776ae744f99d09246080c2fb04932d SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f WHIRLPOOL 03661682889446262302083b144071966adca4d0cdf0b6bc859ce364c9603a9e26f2a0032ed0332b6966a444317d3e5e73182548f51505de5e4c2ea6f21ed0af
-AUX bacula-sd.confd 391 SHA256 7a5d4678f2b5589de91d8d45ed6eccf8d44860b946fefe8a392e81a204aa6709 SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d WHIRLPOOL d5ebcb7e5497f103b047e30cc04d2ea34b185be85137d35ce0c6881e70a5b14d74ddb48fd5bafbb031bb45e4fac38575b5daeaca037aa02d3255747928411c92
-AUX newscripts/bacula-dir.initd 315 SHA256 691de7fd0936835f8e2a17798b95be1f3300c32468b598731128a9aab123569e SHA512 cbb52bb584e8639a12930491bb5fdd88c279e3ac79a2460c1ceb5d2b9ca4cd4b4fb5be460b8a366ba21d2056befedcc6298468834648d47a5daac814733685f9 WHIRLPOOL c9924c5f82a9eefec52e35af61cddd24d641e23942abcfcb1f2b896c092fe33a6efedd2ee7967152a8652a8dd563ba603582d1ee68fcc2c100b19bfdd8bc703c
-AUX newscripts/bacula-fd.initd 253 SHA256 b0fa587090c8df99c5fd71248c0f468d2004e79bc647d2b2c02381ca4eab1579 SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7 WHIRLPOOL 2647939b99e05ddbcdeacc8754734a02b66fb9c87830a29f1433cede6b28d8a9814a80d3c15f891e8f200fff5d1cb6fe1660e8a4f2e423b7c4f125651e065342
-AUX newscripts/bacula-sd.initd 252 SHA256 5d29a7d31314be6bd7ea0d2b14928e811f13934c13c55f9fbb807bc2a0640fcb SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4 WHIRLPOOL 10b58974dc7eb13408c142cca43b6cb72ec0ddc2c4a6e04de181e820ef1e12030ebb2a796b4b9f152b423c69f53cb3b116e54557f31ee276ee0acbd17eed922e
-DIST bacula-11.0.5.tar.gz 5982886 SHA256 ef5b3b67810442201b80dc1d47ccef77b5ed378fe1285406f3a73401b6e8111a SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17 WHIRLPOOL c05944280af471a31c8da6ff07eb90434bc4e2f51f66c9ab05fb26eb920dbb8f9b313117e97e14a91853b2b5f9ebbf4c5eea83d7aaafb79e29fd1c7cb3609af2
-EBUILD bacula-11.0.5.ebuild 11821 SHA256 bae854a9977b6d8da94fbcbc332f32ba36e78fc9fafec4fa5f783373fb00a82b SHA512 822eccbd3d6edb3dc2d68e05029aeaad83302da401e942716c69934eb16869ab91b02aa4b317f66c12be265e144299efa65678f83b682d9b2c53070e0f79d5e2 WHIRLPOOL a4f58623c73bd11d339147ec7396873e1f7c88effc79ee13e8c701288f1f26c2fc99ed9fbae3bb6b54ba85adcca7fd0b42ec40234df2d814e28473e06843d72f
-MISC metadata.xml 697 SHA256 dc7fe30203bdf512538a3c5d883f82adef6fc714147d314539117a2976d7f660 SHA512 6d0077158112c26232370f11ec0d00ccb14376ce2649cc8ef79d3f99332bbe1bf18968a42e9c20d82934be3f9b49d49cf1f848e4e837143f8a5914fade6b14f7 WHIRLPOOL 73e4484ae58d6826dacd01f5a519684238dc0a7dcea076203f03cd4ecfd136995379272ad1233d074f853ebcf252d8ae6b2d09ea6428e1ba77a456d72f56c67a
diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
deleted file mode 100644
index 92fd4e27..00000000
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ /dev/null
@@ -1,414 +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="s3 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 )
-	s3? ( net-fs/libs3 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with s3 s3) \
-		$(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 \
-		--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/5.2.3/bacula-5.2.3-as-needed.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
deleted file mode 100644
index 4b52d214..00000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# see bug #310087 
-diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in
---- bacula-5.2.1.orig/src/findlib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.2.1/src/findlib/Makefile.in	2010-03-22 17:37:43.772805754 +0100
-@@ -59,7 +59,7 @@
- 
- libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
-
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
deleted file mode 100644
index 58d26316..00000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/328701
-http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
-
---- src/lib/crypto.c
-+++ src/lib/crypto.c
-@@ -51,7 +51,7 @@
-  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
-  *  exists.  It was not an official API.
-  */
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
- #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
- #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
- #endif
---- src/lib/tls.c
-+++ src/lib/tls.c
-@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
-          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
- 
-          if (strcmp(extname, "subjectAltName") == 0) {
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
-             const X509V3_EXT_METHOD *method;
- #else
-             X509V3_EXT_METHOD *method;
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 e076cd64..00000000
--- 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/7.2.0/bacula-7.2.0-doc.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
deleted file mode 100644
index 155746a8..00000000
--- a/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	2015-09-03 20:03:22.000000000 +0200
-+++ Makefile.in	2015-09-03 20:03:50.000000000 +0200
-@@ -35,8 +35,7 @@
- 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
- 	autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING ChangeLog README ReleaseNotes LICENSE \
--	    LICENSE-FAQ LICENSE-FOSS INSTALL
-+doc_files =
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
deleted file mode 100644
index 33cf83dc..00000000
--- a/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of 
-# lib search path.
---- src/console/Makefile.in.orig	2017-07-26 15:03:07.000000000 +0200
-+++ src/console/Makefile.in	2017-07-23 18:31:57.000000000 +0200
-@@ -49,17 +49,17 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 	strip $@
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
deleted file mode 100644
index 3d055b8c..00000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/qt-console/bat.pro.in.orig	2018-02-18 16:17:21.027921363 +0100
-+++ src/qt-console/bat.pro.in	2018-02-18 16:18:12.554137528 +0100
-@@ -12,7 +12,7 @@
- greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
- 
- bins.path = /$(DESTDIR)@sbindir@
--bins.files = bat
-+bins.files = .libs/bat
- confs.path = /$(DESTDIR)@sysconfdir@
- confs.commands = ./install_conf_file
- help.path = /$(DESTDIR)@docdir@
-@@ -29,6 +29,9 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
-+QMAKE_CFLAGS += @CFLAGS@
-+QMAKE_CXXFLAGS += @CXXFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@
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 1f32cd22..00000000
--- 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-11.0.2-fix-static.patch b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
deleted file mode 100644
index f7ffccf0..00000000
--- a/app-backup/bacula/files/bacula-11.0.2-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$(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/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 4862bcec..00000000
--- 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"),
diff --git a/app-backup/bacula/files/bacula-dir.confd b/app-backup/bacula/files/bacula-dir.confd
deleted file mode 100644
index 59f68466..00000000
--- a/app-backup/bacula/files/bacula-dir.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bacula-dir
-
-# If the database server where you store your bacula catalog
-# is on a different machine, please set this to 0.
-# Setting it to 1 makes bacula-dir depend on the corresponding
-# database service selected at package compile time.
-LOCAL_DB=1
-
-# Options for the director daemon.
-# The director can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/bacula-fd.confd b/app-backup/bacula/files/bacula-fd.confd
deleted file mode 100644
index eed82ccb..00000000
--- a/app-backup/bacula/files/bacula-fd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bacula-fd
-
-# Options for the file daemon.
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch
deleted file mode 100644
index d05b2b9a..00000000
--- a/app-backup/bacula/files/bacula-fix-sonames.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'autoconf/ltmain.sh'
---- autoconf/ltmain.sh	2011-11-06 20:34:58 +0000
-+++ autoconf/ltmain.sh	2012-02-09 17:27:13 +0000
-@@ -2428,6 +2428,7 @@
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-+  -soname SONAME    override the standard shared object name
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-@@ -5422,6 +5423,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        soname)
-+	  soname_spec="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
-@@ -5741,6 +5747,11 @@
- 	continue
- 	;;
- 
-+      -soname)
-+	prev=soname
-+	continue
-+	;;
-+
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
-
diff --git a/app-backup/bacula/files/bacula-sd.confd b/app-backup/bacula/files/bacula-sd.confd
deleted file mode 100644
index 8d6f7d2e..00000000
--- a/app-backup/bacula/files/bacula-sd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bacula-sd
-
-# Options for the storage daemon.
-# The storage daemon can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd
deleted file mode 100644
index fdcfc7ef..00000000
--- a/app-backup/bacula/files/newscripts/bacula-dir.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-command=/usr/sbin/bacula-dir
-command_args="${DIR_OPTIONS}"
-pidfile=/var/run/bacula-dir.9101.pid
-
-depend() {
-	need net
-	if [ "${LOCAL_DB}" -eq 1 ]; then
-		:
-	fi
-	use dns bacula-fd bacula-sd
-}
-
diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd
deleted file mode 100644
index fe6a8815..00000000
--- a/app-backup/bacula/files/newscripts/bacula-fd.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/bacula-fd
-command_args="${FD_OPTIONS}"
-pidfile=/var/run/bacula-fd.9102.pid
-
-depend() {
-	need net
-	use dns
-}
diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd
deleted file mode 100644
index 07facefb..00000000
--- a/app-backup/bacula/files/newscripts/bacula-sd.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-command=/usr/sbin/bacula-sd
-command_args="${SD_OPTIONS}"
-pidfile=/var/run/bacula-sd.9103.pid
-
-depend() {
-	need net
-	use dns
-}
diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
deleted file mode 100644
index 8a6dd3f7..00000000
--- a/app-backup/bacula/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tomjbe@gentoo.org</email>
-		<name>Thomas Beierlein</name>
-	</maintainer>
-	<use>
-		<flag name="bacula-clientonly">Disable DB support, and just build a
-			client</flag>
-		<flag name="bacula-nodir">Disable building of director</flag>
-		<flag name="bacula-nosd">Disable building of storage daemon</flag>
-		<flag name="batch-insert">Enable batch insert into data base</flag>
-		<flag name="logwatch">Install support files for logwatch</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">bacula</remote-id>
-	</upstream>
-</pkgmetadata>