commit:     b99f34b85e04e2c26d6e9b919d77f614f4551aa6
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 08:48:43 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 08:48:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99f34b8

app-backup/bacula: drop 9.6.5, 9.6.6, 9.6.7, 11.0.2, 11.0.3

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/Manifest                         |   5 -
 app-backup/bacula/bacula-11.0.2.ebuild             | 417 --------------------
 app-backup/bacula/bacula-11.0.3.ebuild             | 413 --------------------
 app-backup/bacula/bacula-9.6.5.ebuild              | 419 ---------------------
 app-backup/bacula/bacula-9.6.6.ebuild              | 419 ---------------------
 app-backup/bacula/bacula-9.6.7.ebuild              | 419 ---------------------
 .../bacula/files/7.0.2/bacula-7.0.2-depend.patch   |  12 -
 .../files/9.6.3/bacula-9.6.3-fix-static.patch      |  63 ----
 .../files/bacula-9.6.x-fix-race-condition.patch    |  15 -
 9 files changed, 2182 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index be60a8bdd625..150f4b27934d 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,6 +1 @@
-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

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.3.ebuild
deleted file mode 100644
index b2738be8a8a5..000000000000
--- a/app-backup/bacula/bacula-11.0.3.ebuild
+++ /dev/null
@@ -1,413 +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}"/${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 ssl openssl) \
-               $(use_enable ipv6) \
-               $(use_enable acl) \
-               $(use_with tcpd tcp-wrappers)"
-
-       econf \
-               --with-pid-dir=/var/run \
-               --sysconfdir=/etc/bacula \
-               --with-archivedir=/var/lib/bacula/tmp \
-               --with-subsys-dir=/var/lock/subsys \
-               --with-working-dir=/var/lib/bacula \
-               --with-logdir=/var/lib/bacula \
-               --with-scriptdir=/usr/libexec/bacula \
-               --with-systemd=$(systemd_get_systemunitdir) \
-               --with-dir-user=bacula \
-               --with-dir-group=bacula \
-               --with-sd-user=root \
-               --with-sd-group=bacula \
-               --with-fd-user=root \
-               --with-fd-group=bacula \
-               --enable-smartalloc \
-               --disable-afs \
-               --without-s3 \
-               --host=${CHOST} \
-               ${myconf}
-}
-
-src_compile() {
-       # Make build log verbose (bug #447806)
-       emake NO_ECHO=""
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       doicon scripts/bacula.png
-
-       # install bat icon and desktop file when enabled
-       # (for some reason ./configure doesn't pick this up)
-       if use qt5 && ! use static ; then
-               doicon src/qt-console/images/bat_icon.png
-               domenu scripts/bat.desktop
-       fi
-
-       # remove some scripts we don't need at all
-       rm -f 
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-       # rename statically linked apps
-       if use bacula-clientonly && use static ; then
-               pushd "${D}"/usr/sbin || die
-               mv static-bacula-fd bacula-fd || die
-               mv static-bconsole bconsole || die
-               popd || die
-       fi
-
-       # extra files which 'make install' doesn't cover
-       if ! use bacula-clientonly; then
-           # the database update scripts
-               diropts -m0750
-               insinto /usr/libexec/bacula/updatedb
-               insopts -m0754
-               doins "${S}"/updatedb/*
-               fperms 0640 /usr/libexec/bacula/updatedb/README
-
-               # the logrotate configuration
-               # (now unconditional wrt bug #258187)
-               diropts -m0755
-               insinto /etc/logrotate.d
-               insopts -m0644
-               newins "${S}"/scripts/logrotate bacula
-
-               # the logwatch scripts
-               if use logwatch; then
-                       diropts -m0750
-                       dodir /usr/share/logwatch/scripts/services
-                       dodir /usr/share/logwatch/scripts/shared
-                       dodir /etc/logwatch/conf/logfiles
-                       dodir /etc/logwatch/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       # Install all man pages
-       doman "${S}"/manpages/*.[18]
-
-       if ! use qt5; then
-               rm -vf "${D}"/usr/share/man/man1/bat.1*
-       fi
-       rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-       if use bacula-clientonly || use bacula-nodir ; then
-               rm -vf "${D}"/usr/libexec/bacula/create_*_database
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-               rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-               rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-       fi
-       if use bacula-clientonly || use bacula-nosd; then
-               rm -vf "${D}"/usr/libexec/bacula/disk-changer
-               rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-               rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-       fi
-
-       # documentation
-       dodoc ChangeLog ReleaseNotes SUPPORT
-
-       # install examples (bug #457504)
-       if use examples; then
-               docinto examples/
-               dodoc -r examples/*
-       fi
-
-       # vim-files
-       if use vim-syntax; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins scripts/bacula.vim
-               insinto /usr/share/vim/vimfiles/ftdetect
-               newins scripts/filetype.vim bacula_ft.vim
-       fi
-
-       # setup init scripts
-       myscripts="bacula-fd"
-       if ! use bacula-clientonly; then
-               if ! use bacula-nodir; then
-                       myscripts="${myscripts} bacula-dir"
-               fi
-               if ! use bacula-nosd; then
-                       myscripts="${myscripts} bacula-sd"
-               fi
-       fi
-       for script in ${myscripts}; do
-               # copy over init script and config to a temporary location
-               # so we can modify them as needed
-               cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die 
"failed to copy ${script}.confd"
-               cp "${FILESDIR}/newscripts/${script}".initd 
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-               # now set the database dependancy for the director init script
-               case "${script}" in
-                       bacula-dir)
-                               case "${mydbtype}" in
-                                       sqlite3)
-                                               # sqlite databases don't have a 
daemon
-                                               sed -i -e 's/need 
"%database%"/:/g' "${T}/${script}".initd || die
-                                               ;;
-                                       *)
-                                               # all other databases have 
daemons
-                                               sed -i -e 
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-                                               ;;
-                               esac
-                               ;;
-                       *)
-                               ;;
-               esac
-
-               # install init script and config
-               newinitd "${T}/${script}".initd "${script}"
-               newconfd "${T}/${script}".confd "${script}"
-       done
-
-       systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-       # make sure the working directory exists
-       diropts -m0750
-       keepdir /var/lib/bacula
-
-       # make sure bacula group can execute bacula libexec scripts
-       fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-       if use bacula-clientonly; then
-               fowners root:bacula /var/lib/bacula
-       else
-               fowners bacula:bacula /var/lib/bacula
-       fi
-
-       einfo
-       einfo "A group 'bacula' has been created. Any users you add to this"
-       einfo "group have access to files created by the daemons."
-       einfo
-       einfo "A user 'bacula' has been created.  Please see the bacula manual"
-       einfo "for information about running bacula as a non-root user."
-       einfo
-
-       if ! use bacula-clientonly && ! use bacula-nodir; then
-               einfo
-               einfo "If this is a new install, you must create the 
${mydbtype} databases with:"
-               einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-               einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-               einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-               einfo
-
-               ewarn "ATTENTION!"
-               ewarn "The format of the database may have changed."
-               ewarn "If you just upgraded from a version below 9.0.0 you must 
run"
-               ewarn "'update_bacula_tables' now."
-               ewarn "Make sure to have a backup of your catalog before."
-               ewarn
-       fi
-
-       if use sqlite; then
-               einfo
-               einfo "Be aware that Bacula does not officially support SQLite 
database anymore."
-               einfo "Best use it only for a client-only installation. See Bug 
#445540."
-               einfo
-       fi
-
-       einfo "Please note that 'bconsole' will always be installed. To compile 
'bat'"
-       einfo "you have to enable 'USE=qt5'."
-       einfo
-       einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will 
be used during"
-       einfo "restores, so be sure to set it to an appropriate in dir in the 
bacula config."
-}

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild 
b/app-backup/bacula/bacula-9.6.5.ebuild
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"),

Reply via email to