[gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/9.4.1/, app-backup/bacula/files/9.0.6/, ...

Sat, 21 Mar 2020 05:56:46 -0700 

commit:     362bb42a1e80d411a84b64fd6d956b28fdffd0d5
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 12:53:23 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 12:55:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362bb42a

app-backup/bacula: Drop old

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/Manifest                         |   5 -
 app-backup/bacula/bacula-9.0.8-r1.ebuild           | 434 --------------------
 app-backup/bacula/bacula-9.2.2-r2.ebuild           | 434 --------------------
 app-backup/bacula/bacula-9.4.1-r2.ebuild           | 438 ---------------------
 app-backup/bacula/bacula-9.4.2-r1.ebuild           | 435 --------------------
 app-backup/bacula/bacula-9.4.3-r1.ebuild           | 435 --------------------
 app-backup/bacula/bacula-9.4.4-r1.ebuild           | 435 --------------------
 .../files/9.0.6/bacula-9.0.6-libressl26.patch      |  62 ---
 .../files/9.0.6/bacula-9.0.6-libressl27.patch      |  11 -
 .../bacula/files/9.4.1/bacula-9.4.1_sql.patch      |  11 -
 app-backup/bacula/files/bacula-dir.initd           |  24 --
 app-backup/bacula/files/bacula-fd.initd            |  21 -
 app-backup/bacula/files/bacula-sd.initd            |  21 -
 13 files changed, 2766 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 12f45128369..be7d1cbe8ab 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,6 +1 @@
-DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B 
be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937
 SHA512 
4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64
-DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B 
affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8
 SHA512 
390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708
-DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B 
f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332
 SHA512 
5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee
-DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 
5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8
 SHA512 
f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d
-DIST bacula-9.4.3.tar.gz 4167892 BLAKE2B 
058d51fa62f7a37ccb19d91c33589dd2d2a52ee2d17e82c5b5ce7b9f80f36ead81cd6cb4fafcfc269f4202a2a9f989106ade72efd673f89693f155c0f4a0b336
 SHA512 
042bf1b974ff60b054bd4a16ce93cd1d93b89d0b743f340c00cc4636922e1e25a38d97dc140bf5842859b3694736df2a812801747ced678610f8583e14ea5e81
 DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 
29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3
 SHA512 
f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild 
b/app-backup/bacula/bacula-9.0.8-r1.ebuild
deleted file mode 100644
index 952cb1667a9..00000000000
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit qmake-utils desktop systemd user libtool
-
-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 examples ipv6 libressl 
logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:=[threads] )
-               mysql? ( dev-db/mysql-connector-c:= )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       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 )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       readline? ( sys-libs/readline:0 )
-       static? (
-               acl? ( virtual/acl[static-libs] )
-               sys-libs/zlib[static-libs]
-               dev-libs/lzo[static-libs]
-               sys-libs/ncurses:=[static-libs]
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               acl? ( virtual/acl )
-               sys-libs/zlib
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )"
-RDEPEND="${DEPEND}
-       !bacula-clientonly? (
-               !bacula-nosd? (
-                       sys-block/mtx
-                       app-arch/mt-st
-               )
-       )
-       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"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       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.0.8/${PN}-9.0.8-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
-
-       # fix wrong handling of libressl version
-       # needs separate handling for <libressl-2.7 and >=libressl2.7
-       # (see bug #655520)
-       if has_version "<dev-libs/libressl-2.7"; then
-               eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl26.patch
-       else
-               eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch
-       fi
-
-       # 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}"
-               if use mysql; then
-                   myconf="${myconf} \
-                       --disable-batch-insert"
-               else
-                   myconf="${myconf} \
-                       --enable-batch-insert"
-               fi
-       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 !readline conio) \
-               $(use_enable readline) \
-               $(use_with readline readline /usr) \
-               $(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-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
-
-       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/share/man/man8/bacula-dir.8*
-               rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-               rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-               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/share/man/man8/bacula-sd.8*
-               rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-               rm -vf "${D}"/usr/share/man/man8/bextract.8*
-               rm -vf "${D}"/usr/share/man/man8/bls.8*
-               rm -vf "${D}"/usr/share/man/man8/bscan.8*
-               rm -vf "${D}"/usr/share/man/man8/btape.8*
-               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
-
-       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
-}

diff --git a/app-backup/bacula/bacula-9.2.2-r2.ebuild 
b/app-backup/bacula/bacula-9.2.2-r2.ebuild
deleted file mode 100644
index 7137d55ca7b..00000000000
--- a/app-backup/bacula/bacula-9.2.2-r2.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd user
-
-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 libressl 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? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-       !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"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       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.0.8/${PN}-9.0.8-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
-
-       # fix wrong handling of libressl version
-       # needs separate handling for <libressl-2.7 and >=libressl2.7
-       # (see bug #655520)
-       if has_version "<dev-libs/libressl-2.7"; then
-               eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl26.patch
-       else
-               eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch
-       fi
-
-       # Don't let program instal man pages directly
-       rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages 
Makefile.in"
-       eapply -p1 "${FILESDIR}/bacula-fix-manpages.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 readline readline /usr) \
-               $(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/*
-
-       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
-
-       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.4.1-r2.ebuild 
b/app-backup/bacula/bacula-9.4.1-r2.ebuild
deleted file mode 100644
index 1833beec7e7..00000000000
--- a/app-backup/bacula/bacula-9.4.1-r2.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd user
-
-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 libressl 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? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-       !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"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       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.0.8/${PN}-9.0.8-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
-
-       # fix handling of libressl version
-       # needs separate handling for <libressl-2.7 and >=libressl2.7
-       # (see bug #655520)
-       if has_version "<dev-libs/libressl-2.7"; then
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-       else
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-       fi
-
-       # Fix an integer overflow (Thanks Ph. Stracchino)
-       eapply -p1 "${FILESDIR}"/9.4.1/${PN}-9.4.1_sql.patch
-
-       # Don't let program install man pages directly
-       rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages 
Makefile.in"
-       eapply -p1 "${FILESDIR}/bacula-fix-manpages.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 readline readline /usr) \
-               $(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/*
-
-       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
-
-       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.4.2-r1.ebuild 
b/app-backup/bacula/bacula-9.4.2-r1.ebuild
deleted file mode 100644
index c2f2b3eb4f7..00000000000
--- a/app-backup/bacula/bacula-9.4.2-r1.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd user
-
-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 libressl 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? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-       !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"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       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.0.8/${PN}-9.0.8-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
-
-       # fix handling of libressl version
-       # needs separate handling for <libressl-2.7 and >=libressl2.7
-       # (see bug #655520)
-       if has_version "<dev-libs/libressl-2.7"; then
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-       else
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-       fi
-
-       # Don't let program install man pages directly
-       rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages 
Makefile.in"
-       eapply -p1 "${FILESDIR}/bacula-fix-manpages.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 readline readline /usr) \
-               $(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/*
-
-       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
-
-       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.4.3-r1.ebuild 
b/app-backup/bacula/bacula-9.4.3-r1.ebuild
deleted file mode 100644
index c2f2b3eb4f7..00000000000
--- a/app-backup/bacula/bacula-9.4.3-r1.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd user
-
-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 libressl 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? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-       !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"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       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.0.8/${PN}-9.0.8-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
-
-       # fix handling of libressl version
-       # needs separate handling for <libressl-2.7 and >=libressl2.7
-       # (see bug #655520)
-       if has_version "<dev-libs/libressl-2.7"; then
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-       else
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-       fi
-
-       # Don't let program install man pages directly
-       rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages 
Makefile.in"
-       eapply -p1 "${FILESDIR}/bacula-fix-manpages.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 readline readline /usr) \
-               $(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/*
-
-       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
-
-       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.4.4-r1.ebuild 
b/app-backup/bacula/bacula-9.4.4-r1.ebuild
deleted file mode 100644
index c2f2b3eb4f7..00000000000
--- a/app-backup/bacula/bacula-9.4.4-r1.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd user
-
-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 libressl 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? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               sys-libs/zlib
-               acl? ( virtual/acl )
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-       !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"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if use bacula-clientonly && use static && use qt5; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt5' useflag."
-               ewarn
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       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.0.8/${PN}-9.0.8-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
-
-       # fix handling of libressl version
-       # needs separate handling for <libressl-2.7 and >=libressl2.7
-       # (see bug #655520)
-       if has_version "<dev-libs/libressl-2.7"; then
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-       else
-               eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-       fi
-
-       # Don't let program install man pages directly
-       rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages 
Makefile.in"
-       eapply -p1 "${FILESDIR}/bacula-fix-manpages.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 readline readline /usr) \
-               $(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/*
-
-       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
-
-       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/9.0.6/bacula-9.0.6-libressl26.patch 
b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch
deleted file mode 100644
index 3df4285c2e2..00000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
-+++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
-@@ -195,7 +195,7 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && 
!defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else
---- src/lib/openssl-compat.h.orig       2018-02-02 15:26:04.182557000 -0600
-+++ src/lib/openssl-compat.h    2018-02-02 15:27:50.229100000 -0600
-@@ -1,7 +1,7 @@
- #ifndef __OPENSSL_COPMAT__H__
- #define __OPENSSL_COPMAT__H__
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || 
defined(LIBRESSL_VERSION_NUMBER) )
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
- {
-        CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
---- src/lib/openssl.c.orig     2018-02-16 08:36:24.092583000 -0600
-+++ src/lib/openssl.c  2018-02-16 08:37:23.795454000 -0600
-@@ -69,7 +69,7 @@
-    }
- }
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || 
defined(LIBRESSL_VERSION_NUMBER) )
- /* Array of mutexes for use with OpenSSL static locking */
- static pthread_mutex_t *mutexes;
- 
-@@ -263,7 +263,7 @@
- {
-    int stat = 0;
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || 
defined(LIBRESSL_VERSION_NUMBER) )
-    if ((stat = openssl_init_threads()) != 0) {
-       berrno be;
-       Jmsg1(NULL, M_ABORT, 0,
-@@ -310,7 +310,7 @@
-       Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n"));
-    }
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || 
defined(LIBRESSL_VERSION_NUMBER) )
-    openssl_cleanup_threads();
- 
-    /* Free libssl and libcrypto error strings */
---- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100
-+++ src/lib/tls.c      2018-04-16 20:00:54.082000000 +0200
-@@ -116,7 +116,7 @@
-    ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
- 
-    /* Allocate our OpenSSL TLS Context */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || 
defined(LIBRESSL_VERSION_NUMBER) )
-    /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
-    ctx->openssl = SSL_CTX_new(TLS_method());
- 

diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch 
b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch
deleted file mode 100644
index b87f4b13f9f..00000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
-+++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
-@@ -195,7 +195,7 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && 
!defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else

diff --git a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch 
b/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch
deleted file mode 100644
index b2b7c4863d2..00000000000
--- a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bacula-9.4.1.orig/src/cats/sql_update.c  2018-12-16 05:30:25.000000000 
-0500
-+++ bacula-9.4.1/src/cats/sql_update.c  2018-12-31 12:58:09.107874630 -0500
-@@ -375,7 +375,7 @@
-         
"LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s,"
-         "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s,"
-         "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d,"
--        "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%d"
-+        "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%u"
-         " WHERE VolumeName='%s'",
-         mr->VolJobs, mr->VolFiles, mr->VolBlocks,
-         edit_uint64(mr->VolBytes, ed1),

diff --git a/app-backup/bacula/files/bacula-dir.initd 
b/app-backup/bacula/files/bacula-dir.initd
deleted file mode 100644
index 0601ca56e2c..00000000000
--- a/app-backup/bacula/files/bacula-dir.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-       need net
-       if [ "${LOCAL_DB}" -eq 1 ]; then
-               need "%database%"
-       fi
-       use dns bacula-fd bacula-sd
-}
-
-start() {
-       ebegin "Starting bacula director"
-       start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-               -- ${DIR_OPTIONS}
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping bacula director"
-       start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-       eend $?
-}

diff --git a/app-backup/bacula/files/bacula-fd.initd 
b/app-backup/bacula/files/bacula-fd.initd
deleted file mode 100644
index 1cc636edbf9..00000000000
--- a/app-backup/bacula/files/bacula-fd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-       need net
-       use dns
-}
-
-start() {
-       ebegin "Starting bacula file daemon"
-       start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-               -- ${FD_OPTIONS}
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping bacula file daemon"
-       start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-       eend $?
-}

diff --git a/app-backup/bacula/files/bacula-sd.initd 
b/app-backup/bacula/files/bacula-sd.initd
deleted file mode 100644
index a18840242ef..00000000000
--- a/app-backup/bacula/files/bacula-sd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-       need net
-       use dns
-}
-
-start() {
-       ebegin "Starting bacula storage daemon"
-       start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-               -- ${SD_OPTIONS}
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping bacula storage daemon"
-       start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-       eend $?
-}

Reply via email to