commit:     34a04da9ee1d9e446fc98f5edb36e339436eada6
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  9 06:55:56 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Nov  9 06:59:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a04da9

Drop old

 app-backup/bacula/bacula-5.2.13-r4.ebuild          | 423 ---------------------
 app-backup/bacula/bacula-7.4.0-r1.ebuild           | 410 --------------------
 app-backup/bacula/bacula-7.4.0.ebuild              | 408 --------------------
 app-backup/bacula/bacula-7.4.1.ebuild              | 410 --------------------
 app-backup/bacula/bacula-7.4.2.ebuild              | 410 --------------------
 .../bacula/files/5.0.3/bacula-5.0.3-Makefile.patch |  26 --
 .../files/5.0.3/bacula-5.0.3-as-needed.patch       |  33 --
 .../bacula/files/5.0.3/bacula-5.0.3-cve.patch      | 125 ------
 .../bacula/files/5.0.3/bacula-5.0.3-doc.patch      |  13 -
 .../files/5.0.3/bacula-5.0.3-fix-static.patch      |  47 ---
 .../bacula/files/5.0.3/bacula-5.0.3-ldflags.patch  |  10 -
 .../files/5.0.3/bacula-5.0.3-lib-search-path.patch |  12 -
 .../files/5.0.3/bacula-5.0.3-openssl-1.patch       |  25 --
 13 files changed, 2352 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r4.ebuild 
b/app-backup/bacula/bacula-5.2.13-r4.ebuild
deleted file mode 100644
index 13ed8fe..00000000
--- a/app-backup/bacula/bacula-5.2.13-r4.ebuild
+++ /dev/null
@@ -1,423 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit eutils multilib python-single-r1 qt4-r2 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://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 python qt4 readline +sqlite ssl static tcpd vim-syntax 
X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:*[threads] )
-               mysql? ( virtual/mysql )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       qt4? (
-               dev-qt/qtsvg:4
-               x11-libs/qwt:5
-       )
-       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= )
-               )
-       )
-       python? ( ${PYTHON_DEPS} )
-       "
-RDEPEND="${DEPEND}
-       !bacula-clientonly? (
-               !bacula-nosd? (
-                       sys-block/mtx
-                       app-arch/mt-st
-               )
-       )
-       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
-                               static? ( bacula-clientonly )
-                               python? ( ${PYTHON_REQUIRED_USE} )"
-
-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 qt4; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt4' 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
-
-       use python && python-single-r1_pkg_setup
-}
-
-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)
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
-
-       # bug #310087
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-       # stop build for errors in subdirs
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
-
-       # bat needs to respect LDFLAGS
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-       # bug #328701
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       epatch "${FILESDIR}"/5.2.10/${PN}-5.2.10-fix-static.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
-       epatch "${FILESDIR}"/5.2.12/${PN}-5.2.12-depend.patch
-
-       # 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
-
-       # Fix tmpfiles config for client-only (no bacula user) install
-       # NOTE: Change only first occurance (user) not second (group)
-       # bug 528398 and 577486
-       if use bacula-clientonly; then
-               sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || 
die
-       fi
-
-       # fix bundled libtool (bug 466696)
-       # But first move directory with M4 macros out of the way.
-       # It is only needed by i 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} \
-                       --enable-batch-insert"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt4 bat)"
-       fi
-
-       myconf="${myconf} \
-               --disable-tray-monitor \
-               $(use_with X x) \
-               $(use_with python) \
-               $(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 \
-               --libdir=/usr/$(get_libdir) \
-               --docdir=/usr/share/doc/${PF} \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --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_unitdir) \
-               --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}
-       # correct configuration for QT based bat
-       if use qt4 ; then
-               pushd src/qt-console
-               eqmake4
-               popd
-       fi
-}
-
-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 qt4 && ! 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 /etc/log.d/scripts/services
-                       dodir /etc/log.d/scripts/shared
-                       dodir /etc/log.d/conf/logfiles
-                       dodir /etc/log.d/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-       if ! use qt4; 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 technotes
-
-       # 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}/${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
-       systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
-
-       # 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
-       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=qt4'."
-       einfo
-}

diff --git a/app-backup/bacula/bacula-7.4.0-r1.ebuild 
b/app-backup/bacula/bacula-7.4.0-r1.ebuild
deleted file mode 100644
index da822d4..00000000
--- a/app-backup/bacula/bacula-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib qt4-r2 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://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 qt4 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:*[threads] )
-               mysql? ( virtual/mysql )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       qt4? (
-               dev-qt/qtsvg:4
-               x11-libs/qwt:5
-       )
-       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="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
-                               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 qt4; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt4' 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)
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-       # bug #310087
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-       # bat needs to respect LDFLAGS
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-       # bug #328701
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-fix-static.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
-       epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-       # 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
-
-       # 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} \
-                       --enable-batch-insert"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt4 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 \
-               --libdir=/usr/$(get_libdir) \
-               --docdir=/usr/share/doc/${PF} \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --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_unitdir) \
-               --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}
-       # correct configuration for QT based bat
-       if use qt4 ; then
-               pushd src/qt-console
-               eqmake4
-               popd
-       fi
-}
-
-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 qt4 && ! 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 /etc/log.d/scripts/services
-                       dodir /etc/log.d/scripts/shared
-                       dodir /etc/log.d/conf/logfiles
-                       dodir /etc/log.d/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       if ! use qt4; 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}/${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 7.2.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=qt4'."
-       einfo
-}

diff --git a/app-backup/bacula/bacula-7.4.0.ebuild 
b/app-backup/bacula/bacula-7.4.0.ebuild
deleted file mode 100644
index 3be2523..00000000
--- a/app-backup/bacula/bacula-7.4.0.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib qt4-r2 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://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 qt4 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:*[threads] )
-               mysql? ( virtual/mysql )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       qt4? (
-               dev-qt/qtsvg:4
-               x11-libs/qwt:5
-       )
-       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="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
-                               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 qt4; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt4' 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)
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-       # bug #310087
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-       # bat needs to respect LDFLAGS
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-       # bug #328701
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-fix-static.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
-       epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-       # 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
-
-       # 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} \
-                       --enable-batch-insert"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt4 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 \
-               --libdir=/usr/$(get_libdir) \
-               --docdir=/usr/share/doc/${PF} \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --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_unitdir) \
-               --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}
-       # correct configuration for QT based bat
-       if use qt4 ; then
-               pushd src/qt-console
-               eqmake4
-               popd
-       fi
-}
-
-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 qt4 && ! 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 /etc/log.d/scripts/services
-                       dodir /etc/log.d/scripts/shared
-                       dodir /etc/log.d/conf/logfiles
-                       dodir /etc/log.d/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       if ! use qt4; 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}/${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 7.2.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=qt4'."
-       einfo
-}

diff --git a/app-backup/bacula/bacula-7.4.1.ebuild 
b/app-backup/bacula/bacula-7.4.1.ebuild
deleted file mode 100644
index da822d4..00000000
--- a/app-backup/bacula/bacula-7.4.1.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib qt4-r2 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://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 qt4 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:*[threads] )
-               mysql? ( virtual/mysql )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       qt4? (
-               dev-qt/qtsvg:4
-               x11-libs/qwt:5
-       )
-       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="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
-                               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 qt4; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt4' 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)
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-       # bug #310087
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-       # bat needs to respect LDFLAGS
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-       # bug #328701
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-fix-static.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
-       epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-       # 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
-
-       # 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} \
-                       --enable-batch-insert"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt4 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 \
-               --libdir=/usr/$(get_libdir) \
-               --docdir=/usr/share/doc/${PF} \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --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_unitdir) \
-               --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}
-       # correct configuration for QT based bat
-       if use qt4 ; then
-               pushd src/qt-console
-               eqmake4
-               popd
-       fi
-}
-
-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 qt4 && ! 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 /etc/log.d/scripts/services
-                       dodir /etc/log.d/scripts/shared
-                       dodir /etc/log.d/conf/logfiles
-                       dodir /etc/log.d/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       if ! use qt4; 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}/${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 7.2.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=qt4'."
-       einfo
-}

diff --git a/app-backup/bacula/bacula-7.4.2.ebuild 
b/app-backup/bacula/bacula-7.4.2.ebuild
deleted file mode 100644
index da822d4..00000000
--- a/app-backup/bacula/bacula-7.4.2.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib qt4-r2 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://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 qt4 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:*[threads] )
-               mysql? ( virtual/mysql )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       qt4? (
-               dev-qt/qtsvg:4
-               x11-libs/qwt:5
-       )
-       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="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
-                               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 qt4; then
-               ewarn
-               ewarn "Building statically linked 'bat' is not supported. 
Ignorig 'qt4' 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)
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-       # bug #310087
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-       # bat needs to respect LDFLAGS
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-       # bug #328701
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-fix-static.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
-       epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-       # 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
-
-       # 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} \
-                       --enable-batch-insert"
-       fi
-
-       # do not build bat if 'static' clientonly
-       if ! use bacula-clientonly || ! use static; then
-               myconf="${myconf} \
-                       $(use_enable qt4 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 \
-               --libdir=/usr/$(get_libdir) \
-               --docdir=/usr/share/doc/${PF} \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --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_unitdir) \
-               --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}
-       # correct configuration for QT based bat
-       if use qt4 ; then
-               pushd src/qt-console
-               eqmake4
-               popd
-       fi
-}
-
-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 qt4 && ! 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 /etc/log.d/scripts/services
-                       dodir /etc/log.d/scripts/shared
-                       dodir /etc/log.d/conf/logfiles
-                       dodir /etc/log.d/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       if ! use qt4; 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}/${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 7.2.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=qt4'."
-       einfo
-}

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-Makefile.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-Makefile.patch
deleted file mode 100644
index feab604..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.in.orig   2010-07-20 16:53:44.000000000 +0000
-+++ Makefile.in        2010-07-20 16:55:50.000000000 +0000
-@@ -44,9 +44,8 @@
- 
- all: Makefile
-       @for I in ${all_subdirs}; \
--        do (cd $$I; echo "==>Entering directory `pwd`"; \
--            $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  
====== Error in `pwd` ======"; \
--                          echo ""; echo ""; exit 1;)); \
-+        do \
-+            $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
-       done
- 
- depend:
-@@ -55,9 +54,8 @@
-       
- bacula-fd: Makefile      
-       @for I in ${fd_subdirs}; \
--        do (cd $$I; echo "==>Entering directory `pwd`"; \
--            $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   
====== Error in `pwd` ======"; \
--                          echo ""; echo ""; exit 1;)); \
-+        do \
-+              $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
-       done
- 
- #-------------------------------------------------------------------------

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-as-needed.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-as-needed.patch
deleted file mode 100644
index 3603e93..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN bacula-5.0.3.orig/src/findlib/Makefile.in 
bacula-5.0.3/src/findlib/Makefile.in
---- bacula-5.0.3.orig/src/findlib/Makefile.in  2010-02-24 16:33:48.000000000 
+0100
-+++ bacula-5.0.3/src/findlib/Makefile.in       2010-03-22 17:37:43.772805754 
+0100
-@@ -59,7 +59,7 @@
- 
- libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
-       @echo "Making $@ ..."
--      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ 
$(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release 
$(LIBBACFIND_LT_RELEASE)
-+      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ 
$(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release 
$(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-       cd $(topdir) \
-diff -urN bacula-5.0.1.orig/src/lib/Makefile.in 
bacula-5.0.1/src/lib/Makefile.in
---- bacula-5.0.1.orig/src/lib/Makefile.in      2010-02-24 16:33:48.000000000 
+0100
-+++ bacula-5.0.1/src/lib/Makefile.in   2010-03-22 17:37:05.352226188 +0100
-@@ -126,7 +126,7 @@
- 
- libbac.la: Makefile $(LIBBAC_LOBJS)
-       @echo "Making $@ ..."
--      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ 
$(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) 
$(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
-+      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ 
$(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) 
$(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(LIBS) $(OPENSSL_LIBS)
- 
- libbaccfg.a: $(LIBBACCFG_OBJS) 
-       @echo "Making $@ ..."
-@@ -135,7 +135,7 @@
- 
- libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
-       @echo "Making $@ ..."
--      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ 
$(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release 
$(LIBBACCFG_LT_RELEASE)
-+      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ 
$(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release 
$(LIBBACCFG_LT_RELEASE) $(LIBS) $(OPENSSL_LIBS)
- 
- libbacpy.a: $(LIBBACPY_OBJS) 
-       @echo "Making $@ ..."

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-cve.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-cve.patch
deleted file mode 100644
index 394db6e..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-cve.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 67debcecd3d530c429e817e1d778e79dcd1db905 Mon Sep 17 00:00:00 2001
-From: Kern Sibbald <k...@sibbald.com>
-Date: Sat, 18 Aug 2012 13:46:03 +0000
-Subject: Make dump_resource respect console ACL's
-
----
-diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
-index 7dcf591..2f2eb00 100644
---- a/bacula/src/dird/dird_conf.c
-+++ b/bacula/src/dird/dird_conf.c
-@@ -554,6 +554,7 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
-    bool recurse = true;
-    char ed1[100], ed2[100], ed3[100];
-    DEVICE *dev;
-+   UAContext *ua = (UAContext *)sock;
- 
-    if (res == NULL) {
-       sendit(sock, _("No %s resource defined\n"), res_to_str(type));
-@@ -599,6 +600,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
-       break;
- 
-    case R_CLIENT:
-+      if (!acl_access_ok(ua, Client_ACL, res->res_client.hdr.name)) {
-+         break;
-+      }
-       sendit(sock, _("Client: name=%s address=%s FDport=%d MaxJobs=%u\n"),
-          res->res_client.hdr.name, res->res_client.address, 
res->res_client.FDport,
-          res->res_client.MaxConcurrentJobs);
-@@ -626,6 +630,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
-       break;
- 
-    case R_STORAGE:
-+      if (!acl_access_ok(ua, Storage_ACL, res->res_store.hdr.name)) {
-+         break;
-+      }
-       sendit(sock, _("Storage: name=%s address=%s SDport=%d MaxJobs=%u\n"
- "      DeviceName=%s MediaType=%s StorageId=%s\n"),
-          res->res_store.hdr.name, res->res_store.address, 
res->res_store.SDport,
-@@ -636,6 +643,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
-       break;
- 
-    case R_CATALOG:
-+      if (!acl_access_ok(ua, Catalog_ACL, res->res_cat.hdr.name)) {
-+         break;
-+      }
-       sendit(sock, _("Catalog: name=%s address=%s DBport=%d db_name=%s\n"
- "      db_driver=%s db_user=%s MutliDBConn=%d\n"),
-          res->res_cat.hdr.name, NPRT(res->res_cat.db_address),
-@@ -646,6 +656,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
- 
-    case R_JOB:
-    case R_JOBDEFS:
-+      if (!acl_access_ok(ua, Job_ACL, res->res_job.hdr.name)) {
-+         break;
-+      }
-       sendit(sock, _("%s: name=%s JobType=%d level=%s Priority=%d 
Enabled=%d\n"),
-          type == R_JOB ? _("Job") : _("JobDefs"),
-          res->res_job.hdr.name, res->res_job.JobType,
-@@ -767,6 +780,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
-    case R_FILESET:
-    {
-       int i, j, k;
-+      if (!acl_access_ok(ua, FileSet_ACL, res->res_fs.hdr.name)) {
-+         break;
-+      }
-       sendit(sock, _("FileSet: name=%s\n"), res->res_fs.hdr.name);
-       for (i=0; i<res->res_fs.num_includes; i++) {
-          INCEXE *incexe = res->res_fs.include_items[i];
-@@ -854,6 +870,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void 
*sock, const char *fm
-    }
- 
-    case R_SCHEDULE:
-+      if (!acl_access_ok(ua, Schedule_ACL, res->res_sch.hdr.name)) {
-+         break;
-+      }
-       if (res->res_sch.run) {
-          int i;
-          RUN *run = res->res_sch.run;
-@@ -942,6 +961,9 @@ next_run:
-       break;
- 
-    case R_POOL:
-+      if (!acl_access_ok(ua, Pool_ACL, res->res_pool.hdr.name)) {
-+         break;
-+      }
-       sendit(sock, _("Pool: name=%s PoolType=%s\n"), res->res_pool.hdr.name,
-               res->res_pool.pool_type);
-       sendit(sock, _("      use_cat=%d use_once=%d cat_files=%d\n"),
---
-From 2be20d549211f7984156674116f9239acf6d79bd Mon Sep 17 00:00:00 2001
-From: Kern Sibbald <k...@sibbald.com>
-Date: Sun, 19 Aug 2012 06:33:15 +0000
-Subject: Fix Makefile.in so that testfind builds with acl dependency
-
----
-diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
-index 0c3f305..5731140 100644
---- a/bacula/src/tools/Makefile.in
-+++ b/bacula/src/tools/Makefile.in
-@@ -29,12 +29,12 @@ dummy:
- 
- GETTEXT_LIBS = @LIBINTL@
- 
--FINDOBJS = testfind.o ../dird/dird_conf.o ../dird/inc_conf.o 
../dird/run_conf.o
-+FINDOBJS = testfind.o ../dird/dird_conf.o ../dird/inc_conf.o ../dird/ua_acl.o 
../dird/run_conf.o
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
- 
--DIRCONFOBJS = ../dird/dird_conf.o ../dird/run_conf.o ../dird/inc_conf.o
-+DIRCONFOBJS = ../dird/dird_conf.o ../dird/ua_acl.o ../dird/run_conf.o 
../dird/inc_conf.o
- 
- NODIRTOOLS = bsmtp
- DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch 
bregtest bvfs_test ing_test
-@@ -79,6 +79,9 @@ drivetype: Makefile drivetype.o 
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/
- dird_conf.o: ../dird/dird_conf.c
-       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) 
-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
-+ua_acl.o: ../dird/ua_acl.c
-+      $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) 
-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
-+
- run_conf.o: ../dird/run_conf.c
-       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) 
-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
---

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-doc.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-doc.patch
deleted file mode 100644
index 98c6e6c..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# drop automatic installation of doc files
---- Makefile.in.orig   2011-02-26 09:05:21.000000000 +0000
-+++ Makefile.in        2011-02-26 09:06:01.000000000 +0000
-@@ -34,8 +34,7 @@
-       autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
-       autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
--          INSTALL
-+doc_files = 
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-fix-static.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-fix-static.patch
deleted file mode 100644
index d33a618..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-fix-static.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/console/Makefile.in.orig       2010-12-28 16:01:28.000000000 +0000
-+++ src/console/Makefile.in    2010-12-28 16:02:19.000000000 +0000
-@@ -31,6 +31,7 @@
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:    .c .o
- .PHONY:
-@@ -48,13 +48,12 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o 
$@ $(CONSOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib 
-L../cats -o $@ $(CONSOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
--      strip $@
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS)
-
-
---- src/filed/Makefile.in.orig 2010-12-28 16:19:34.000000000 +0000
-+++ src/filed/Makefile.in      2010-12-28 16:26:28.000000000 +0000
-@@ -94,13 +94,12 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-       @echo "Linking $@ ..."
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o 
$@ $(SVROBJS) \
--        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) $(LIBS) \
--        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS)
-+        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) \
-+        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a 
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib 
-L../findlib -o $@ $(SVROBJS) \
--         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) $(LIBS) \
--         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS)
--      strip $@
-+         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) \
-+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS)
- 

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-ldflags.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-ldflags.patch
deleted file mode 100644
index 1ff3e68..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-ldflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/qt-console/bat.pro.in.orig     2010-07-20 18:28:50.000000000 +0000
-+++ src/qt-console/bat.pro.in  2010-07-20 18:29:25.000000000 +0000
-@@ -26,6 +26,7 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@ 

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-lib-search-path.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-lib-search-path.patch
deleted file mode 100644
index c3bded4..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-lib-search-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of lib search 
path.
---- src/console/Makefile.in.orig       2010-03-29 11:35:00.000000000 +0000
-+++ src/console/Makefile.in    2010-03-29 11:45:14.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--      $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o 
$@ $(CONSOBJS) \
-+      $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o 
$@ $(CONSOBJS) \
-             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
-             $(OPENSSL_LIBS)
- 

diff --git a/app-backup/bacula/files/5.0.3/bacula-5.0.3-openssl-1.patch 
b/app-backup/bacula/files/5.0.3/bacula-5.0.3-openssl-1.patch
deleted file mode 100644
index 58d2631..00000000
--- a/app-backup/bacula/files/5.0.3/bacula-5.0.3-openssl-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/328701
-http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
-
---- src/lib/crypto.c
-+++ src/lib/crypto.c
-@@ -51,7 +51,7 @@
-  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
-  *  exists.  It was not an official API.
-  */
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
- #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
- #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
- #endif
---- src/lib/tls.c
-+++ src/lib/tls.c
-@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
-          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
- 
-          if (strcmp(extname, "subjectAltName") == 0) {
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
-             const X509V3_EXT_METHOD *method;
- #else
-             X509V3_EXT_METHOD *method;

Reply via email to