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

["Thomas Beierlein" <tomjbe@gentoo.org>]

commit:     e70a02b3de5d7fd7b94443a7065c4f390fb2e70e
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 19:17:14 2023 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 19:19:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70a02b3

app-backup/bacula: drop 11.0.5, 11.0.6-r1

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

 app-backup/bacula/Manifest                       |   1 -
 app-backup/bacula/bacula-11.0.5.ebuild           | 416 -----------------------
 app-backup/bacula/bacula-11.0.6-r1.ebuild        | 416 -----------------------
 app-backup/bacula/files/bacula-fix-sonames.patch |  36 --
 4 files changed, 869 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 8d9a6dcc8aa6..9be0f132731c 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1,2 @@
-DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
 DIST bacula-13.0.1.tar.gz 6224778 BLAKE2B 1b5d9aa56aae2de57589a421e33b9d394dcfbaf59f442e19c88c8ca8dcc234ffb42fca3f019e17836ce1d0ede75178c0fecf63b225c54c6d1b6dd0849d2fd50e SHA512 fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426

diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
deleted file mode 100644
index 50ddfc74dfde..000000000000
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			dev-libs/openssl:0=[static-libs]
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# remove not needed .la files #840957
-	find "${ED}" -name '*.la' -delete || die
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}

diff --git a/app-backup/bacula/bacula-11.0.6-r1.ebuild b/app-backup/bacula/bacula-11.0.6-r1.ebuild
deleted file mode 100644
index fe60047ffdcb..000000000000
--- a/app-backup/bacula/bacula-11.0.6-r1.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			dev-libs/openssl:0=[static-libs]
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# remove not needed .la files #840957
-	find "${ED}" -name '*.la' -delete || die
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}

diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch
deleted file mode 100644
index d05b2b9a37fb..000000000000
--- a/app-backup/bacula/files/bacula-fix-sonames.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'autoconf/ltmain.sh'
---- autoconf/ltmain.sh	2011-11-06 20:34:58 +0000
-+++ autoconf/ltmain.sh	2012-02-09 17:27:13 +0000
-@@ -2428,6 +2428,7 @@
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-+  -soname SONAME    override the standard shared object name
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-@@ -5422,6 +5423,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        soname)
-+	  soname_spec="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
-@@ -5741,6 +5747,11 @@
- 	continue
- 	;;
- 
-+      -soname)
-+	prev=soname
-+	continue
-+	;;
-+
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
-