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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-11-12  3:38 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 79+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2018-11-12  3:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e68d2a798da9004d0de5befa961d9bd2d3d24192
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 17:22:11 2018 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 03:34:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68d2a79

app-backup/bacula: Fix typo in postinst.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-backup/bacula/bacula-9.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.2.1.ebuild b/app-backup/bacula/bacula-9.2.1.ebuild
index 4d4577e24ba..d29d8013339 100644
--- a/app-backup/bacula/bacula-9.2.1.ebuild
+++ b/app-backup/bacula/bacula-9.2.1.ebuild
@@ -436,5 +436,5 @@ pkg_postinst() {
 	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."
+	einfo "restores, so be sure to set it to an appropriate dir in the bacula config."
 }


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2024-10-21 20:02 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2024-10-21 20:02 UTC (permalink / raw
  To: gentoo-commits

commit:     544fedfdeb0f3f5cf0b5d903c3d0e879e3eb664e
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 19:57:03 2024 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 20:01:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544fedfd

app-backup/bacula: Do not build with -flto

The package defines some structures with different content for some of
the tools which triggers severe warning with -Werror=odr and
-Werror=lto-type-mismatch

Closes: https://bugs.gentoo.org/940695
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/bacula-15.0.2.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-15.0.2.ebuild b/app-backup/bacula/bacula-15.0.2.ebuild
index 5b3556d73298..80993afbc014 100644
--- a/app-backup/bacula/bacula-15.0.2.ebuild
+++ b/app-backup/bacula/bacula-15.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop libtool qmake-utils systemd
+inherit desktop flag-o-matic libtool qmake-utils systemd
 
 MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
@@ -195,6 +195,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# bug #940695
+	#
+	# common datastructures with partial different components for
+	# different tools of the backup suite
+	filter-lto
+
 	local myconf=''
 
 	if use bacula-clientonly; then


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2024-02-19 16:18 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2024-02-19 16:18 UTC (permalink / raw
  To: gentoo-commits

commit:     e52047a4aad8d0c600e1f999701752e3ab9bf1b1
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 16:13:11 2024 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 16:18:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52047a4

app-backup/bacula: Bump to 13.0.4

Minor bugfix release

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-13.0.4.ebuild | 449 +++++++++++++++++++++++++++++++++
 2 files changed, 450 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 34037aac499c..2642b530361f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1 +1,2 @@
 DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5
+DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a SHA512 5d33714d5575c351e28676cbd165fe7648ce15a1bc2a03f6d5635528083f3ec3bd6c7137a987690dcc8b232105e5768be91ba405a033ad60c4b82f3c88d73812

diff --git a/app-backup/bacula/bacula-13.0.4.ebuild b/app-backup/bacula/bacula-13.0.4.ebuild
new file mode 100644
index 000000000000..96ec4076e135
--- /dev/null
+++ b/app-backup/bacula/bacula-13.0.4.ebuild
@@ -0,0 +1,449 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 selinux +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 )
+	dev-util/patchelf
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	selinux? ( sec-policy/selinux-bacula )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+# suppress warning wrt 'implicit function declaration' in config logs
+# bug 900663
+QA_CONFIG_IMPL_DECL_SKIP=(
+	makedev		# designed to check availability in
+				# used header file
+)
+
+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
+
+	# tray-monitor needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/tray-monitor-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, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
+
+	# correct library search path for slibtool usage (bug #914389)
+	eapply -p0 "${FILESDIR}/fix_slibtool.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
+	sed -i -e "s/+= qt$/+= qt nostrip/" \
+			src/qt-console/tray-monitor/tray-monitor.pro.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
+
+	# same for tray-monitor (bug #915605)
+	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
+		src/qt-console/tray-monitor/tray-monitor.pro.in || die
+	mkdir src/qt-console/tray-monitor/.libs || die
+	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+
+	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || 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 ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||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
+	keepdir /var/lib/bacula/tmp
+
+	# 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*
+		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	fi
+
+	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 dependency 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."
+
+	einfo
+	einfo "If you adapt the port numbers for baculas components in the config files"
+	einfo "make sure to adapt the file names for the pidfile accordingly"
+	einfo "(see init.d scripts)."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2024-01-12  8:28 Arthur Zamarin
  0 siblings, 0 replies; 79+ messages in thread
From: Arthur Zamarin @ 2024-01-12  8:28 UTC (permalink / raw
  To: gentoo-commits

commit:     e209fdefa42f61ac498934a40e14e54a7e9b277f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 08:28:07 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 08:28:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e209fdef

app-backup/bacula: Stabilize 13.0.3-r2 x86, #920282

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-backup/bacula/bacula-13.0.3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild
index f584c49d6a1d..edc149f04ed2 100644
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-12-19  5:08 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2023-12-19  5:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f5d73323590aa517ab8e379b17bb362a45f26247
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 05:07:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 05:07:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d73323

app-backup/bacula: Stabilize 13.0.3-r2 amd64, #920282

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/bacula-13.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild
index 1c404587935e..f584c49d6a1d 100644
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-09-18 10:54 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2023-09-18 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     de2d40f893d33aa020d73161050c3af3cb16aa9c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 10:52:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 10:54:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2d40f8

app-backup/bacula: prepare for postgresql to remove USE=threads

It's always available in newer versions.

Bug: https://bugs.gentoo.org/868393
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/{bacula-11.0.6-r2.ebuild => bacula-11.0.6-r4.ebuild} | 2 +-
 app-backup/bacula/{bacula-11.0.6-r3.ebuild => bacula-11.0.6-r5.ebuild} | 2 +-
 app-backup/bacula/{bacula-13.0.2-r1.ebuild => bacula-13.0.2-r2.ebuild} | 2 +-
 app-backup/bacula/{bacula-13.0.3.ebuild => bacula-13.0.3-r1.ebuild}    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r4.ebuild
similarity index 99%
rename from app-backup/bacula/bacula-11.0.6-r2.ebuild
rename to app-backup/bacula/bacula-11.0.6-r4.ebuild
index 89ef6aa3463e..c0f320e5816f 100644
--- a/app-backup/bacula/bacula-11.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r4.ebuild
@@ -20,7 +20,7 @@ IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6
 DEPEND="
 	!bacula-clientonly? (
 		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
 		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 		sqlite? ( dev-db/sqlite:3 )
 	)

diff --git a/app-backup/bacula/bacula-11.0.6-r3.ebuild b/app-backup/bacula/bacula-11.0.6-r5.ebuild
similarity index 99%
rename from app-backup/bacula/bacula-11.0.6-r3.ebuild
rename to app-backup/bacula/bacula-11.0.6-r5.ebuild
index 7a092c2c85a6..2f5e5150e17d 100644
--- a/app-backup/bacula/bacula-11.0.6-r3.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r5.ebuild
@@ -20,7 +20,7 @@ IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6
 DEPEND="
 	!bacula-clientonly? (
 		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
 		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 		sqlite? ( dev-db/sqlite:3 )
 	)

diff --git a/app-backup/bacula/bacula-13.0.2-r1.ebuild b/app-backup/bacula/bacula-13.0.2-r2.ebuild
similarity index 99%
rename from app-backup/bacula/bacula-13.0.2-r1.ebuild
rename to app-backup/bacula/bacula-13.0.2-r2.ebuild
index 31f0e4ddc989..8477869b3cab 100644
--- a/app-backup/bacula/bacula-13.0.2-r1.ebuild
+++ b/app-backup/bacula/bacula-13.0.2-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6
 DEPEND="
 	!bacula-clientonly? (
 		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
 		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 		sqlite? ( dev-db/sqlite:3 )
 	)

diff --git a/app-backup/bacula/bacula-13.0.3.ebuild b/app-backup/bacula/bacula-13.0.3-r1.ebuild
similarity index 99%
rename from app-backup/bacula/bacula-13.0.3.ebuild
rename to app-backup/bacula/bacula-13.0.3-r1.ebuild
index 2c66671d124f..732e14167c2b 100644
--- a/app-backup/bacula/bacula-13.0.3.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6
 DEPEND="
 	!bacula-clientonly? (
 		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
 		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 		sqlite? ( dev-db/sqlite:3 )
 	)


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-06-28  7:37 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2023-06-28  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     884147833ca663c2ce1a36b0ed2e52dd3bb56f7d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 07:32:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 07:36:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88414783

app-backup/bacula: add missing selinux policy dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/bacula-13.0.3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-13.0.3.ebuild b/app-backup/bacula/bacula-13.0.3.ebuild
index 31f0e4ddc989..2c66671d124f 100644
--- a/app-backup/bacula/bacula-13.0.3.ebuild
+++ b/app-backup/bacula/bacula-13.0.3.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
 	!bacula-clientonly? (
@@ -64,6 +64,7 @@ RDEPEND="${DEPEND}
 			sys-block/mtx
 		)
 	)
+	selinux? ( sec-policy/selinux-bacula )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-05-12  5:58 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2023-05-12  5:58 UTC (permalink / raw
  To: gentoo-commits

commit:     f7a43c0bb786567079d6821d44ebc64604c32dae
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 05:57:34 2023 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri May 12 05:57:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a43c0b

app-backup/bacula: add 13.0.3

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-13.0.3.ebuild | 426 +++++++++++++++++++++++++++++++++
 2 files changed, 427 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 536240c518e2..39cf93529621 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,2 +1,3 @@
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
 DIST bacula-13.0.2.tar.gz 6229127 BLAKE2B 4ff00d995211e92306ac83889d2afab968cba94a711ba9ea88e2e749c09087b87486ed4233ca62316d020721d60891faa8b8a46d40853d4de3ef144291be2b5b SHA512 5bb6fe935881718879df2ffcfd6bf4a74ee89b224265c44f6e470ec18253f68e93ccc576c374ef9fb9e1755d7f6e60193aee7136d084cedf12d3ffb6a52187bc
+DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5

diff --git a/app-backup/bacula/bacula-13.0.3.ebuild b/app-backup/bacula/bacula-13.0.3.ebuild
new file mode 100644
index 000000000000..31f0e4ddc989
--- /dev/null
+++ b/app-backup/bacula/bacula-13.0.3.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 )
+	dev-util/patchelf
+"
+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 )
+"
+
+# suppress warning wrt 'implicit function declaration' in config logs
+# bug 900663
+QA_CONFIG_IMPL_DECL_SKIP=(
+	makedev		# designed to check availability in
+				# used header file
+)
+
+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, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.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 ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||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
+	keepdir /var/lib/bacula/tmp
+
+	# 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 dependency 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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-04-30 11:52 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2023-04-30 11:52 UTC (permalink / raw
  To: gentoo-commits

commit:     57a9fd3ca6cbba20c7d9038a84493aa4bf615396
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 11:15:44 2023 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 11:52:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a9fd3c

app-backup/bacula: drop 13.0.1

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

 app-backup/bacula/Manifest             |   1 -
 app-backup/bacula/bacula-13.0.1.ebuild | 419 ---------------------------------
 2 files changed, 420 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index c993dec1c08f..536240c518e2 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1,2 @@
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
-DIST bacula-13.0.1.tar.gz 6224778 BLAKE2B 1b5d9aa56aae2de57589a421e33b9d394dcfbaf59f442e19c88c8ca8dcc234ffb42fca3f019e17836ce1d0ede75178c0fecf63b225c54c6d1b6dd0849d2fd50e SHA512 fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
 DIST bacula-13.0.2.tar.gz 6229127 BLAKE2B 4ff00d995211e92306ac83889d2afab968cba94a711ba9ea88e2e749c09087b87486ed4233ca62316d020721d60891faa8b8a46d40853d4de3ef144291be2b5b SHA512 5bb6fe935881718879df2ffcfd6bf4a74ee89b224265c44f6e470ec18253f68e93ccc576c374ef9fb9e1755d7f6e60193aee7136d084cedf12d3ffb6a52187bc

diff --git a/app-backup/bacula/bacula-13.0.1.ebuild b/app-backup/bacula/bacula-13.0.1.ebuild
deleted file mode 100644
index ad270ef3da0a..000000000000
--- a/app-backup/bacula/bacula-13.0.1.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 )
-	dev-util/patchelf
-"
-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, see bugs #602952, #790140 and #845126
-	eapply "${FILESDIR}/bacula-fix-sonames-new.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 ||die
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||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
-	keepdir /var/lib/bacula/tmp
-
-	# 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 dependency 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."
-}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-03-29 19:45 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2023-03-29 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     501b76c96d8f022c4445bc8ec3c4451983ed7f90
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 16:56:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 19:44:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501b76c9

app-backup/bacula: fix typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.6-r2.ebuild | 4 ++--
 app-backup/bacula/bacula-13.0.1.ebuild    | 4 ++--
 app-backup/bacula/bacula-13.0.2.ebuild    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r2.ebuild
index 785ae94c4709..89ef6aa3463e 100644
--- a/app-backup/bacula/bacula-11.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -338,7 +338,7 @@ src_install() {
 		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
+		# now set the database dependency for the director init script
 		case "${script}" in
 			bacula-dir)
 				case "${mydbtype}" in

diff --git a/app-backup/bacula/bacula-13.0.1.ebuild b/app-backup/bacula/bacula-13.0.1.ebuild
index 37b6baa2b2cb..ad270ef3da0a 100644
--- a/app-backup/bacula/bacula-13.0.1.ebuild
+++ b/app-backup/bacula/bacula-13.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -340,7 +340,7 @@ src_install() {
 		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
+		# now set the database dependency for the director init script
 		case "${script}" in
 			bacula-dir)
 				case "${mydbtype}" in

diff --git a/app-backup/bacula/bacula-13.0.2.ebuild b/app-backup/bacula/bacula-13.0.2.ebuild
index 758f433d3c7e..ad270ef3da0a 100644
--- a/app-backup/bacula/bacula-13.0.2.ebuild
+++ b/app-backup/bacula/bacula-13.0.2.ebuild
@@ -340,7 +340,7 @@ src_install() {
 		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
+		# now set the database dependency for the director init script
 		case "${script}" in
 			bacula-dir)
 				case "${mydbtype}" in


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-02-24 21:28 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2023-02-24 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     87a0437e4582f18887b0076032027cf86199200b
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 21:13:01 2023 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 21:19:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87a0437e

app-backup/bacula: add 13.0.2

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-13.0.2.ebuild | 419 +++++++++++++++++++++++++++++++++
 2 files changed, 420 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 9be0f132731c..c993dec1c08f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,2 +1,3 @@
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
 DIST bacula-13.0.1.tar.gz 6224778 BLAKE2B 1b5d9aa56aae2de57589a421e33b9d394dcfbaf59f442e19c88c8ca8dcc234ffb42fca3f019e17836ce1d0ede75178c0fecf63b225c54c6d1b6dd0849d2fd50e SHA512 fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
+DIST bacula-13.0.2.tar.gz 6229127 BLAKE2B 4ff00d995211e92306ac83889d2afab968cba94a711ba9ea88e2e749c09087b87486ed4233ca62316d020721d60891faa8b8a46d40853d4de3ef144291be2b5b SHA512 5bb6fe935881718879df2ffcfd6bf4a74ee89b224265c44f6e470ec18253f68e93ccc576c374ef9fb9e1755d7f6e60193aee7136d084cedf12d3ffb6a52187bc

diff --git a/app-backup/bacula/bacula-13.0.2.ebuild b/app-backup/bacula/bacula-13.0.2.ebuild
new file mode 100644
index 000000000000..758f433d3c7e
--- /dev/null
+++ b/app-backup/bacula/bacula-13.0.2.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 )
+	dev-util/patchelf
+"
+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, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.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 ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||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
+	keepdir /var/lib/bacula/tmp
+
+	# 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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2023-02-24 19:20 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2023-02-24 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c47ae1a5a4f1c239addd331dee075dce7c9dc411
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 19:19:27 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=c47ae1a5

app-backup/bacula: Fix QA

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

 app-backup/bacula/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
index 8a6dd3f7f7c4..35c444c8931f 100644
--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="bacula-nodir">Disable building of director</flag>
 		<flag name="bacula-nosd">Disable building of storage daemon</flag>
 		<flag name="batch-insert">Enable batch insert into data base</flag>
+		<flag name="ipv6">Support IPV6 protocol"</flag>
 		<flag name="logwatch">Install support files for logwatch</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2022-08-11  9:54 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2022-08-11  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b0d889ad498a8f0eba094355c168e7606b3e06a4
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 09:52:45 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 09:52:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d889ad

app-backup/bacula: add 13.0.1

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-13.0.1.ebuild | 419 +++++++++++++++++++++++++++++++++
 2 files changed, 420 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 0cb46569ae02..8d9a6dcc8aa6 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,2 +1,3 @@
 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-13.0.1.ebuild b/app-backup/bacula/bacula-13.0.1.ebuild
new file mode 100644
index 000000000000..37b6baa2b2cb
--- /dev/null
+++ b/app-backup/bacula/bacula-13.0.1.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 )
+	dev-util/patchelf
+"
+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, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.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 ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||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
+	keepdir /var/lib/bacula/tmp
+
+	# 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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2022-07-07  6:35 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2022-07-07  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c4a0608bec85ebef5a2c3e8c54ab914e0fb1c917
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 06:35:56 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 06:35:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a0608b

app-backup/bacula: x86 stable wrt bug #856736

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r2.ebuild
index ede482322e81..785ae94c4709 100644
--- a/app-backup/bacula/bacula-11.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+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="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2022-07-07  6:34 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2022-07-07  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     da037d87313c228520e0dc171fd6826be0742336
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 06:34:54 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 06:34:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da037d87

app-backup/bacula: amd64 stable wrt bug #856736

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r2.ebuild
index 4f6706f68b34..ede482322e81 100644
--- a/app-backup/bacula/bacula-11.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+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="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2022-05-21 11:15 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2022-05-21 11:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e0dfb89ea47c003d17a6bbbf3e6905f77e92a357
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 11:13:59 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat May 21 11:15:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dfb89e

app-backup/bacula: Drop unneeded .la files

Closes: https://bugs.gentoo.org/840957
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.5.ebuild    | 3 +++
 app-backup/bacula/bacula-11.0.6-r1.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
index c33c1259fd03..50ddfc74dfde 100644
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ b/app-backup/bacula/bacula-11.0.5.ebuild
@@ -231,6 +231,9 @@ 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

diff --git a/app-backup/bacula/bacula-11.0.6-r1.ebuild b/app-backup/bacula/bacula-11.0.6-r1.ebuild
index 280ae3cb775c..fe60047ffdcb 100644
--- a/app-backup/bacula/bacula-11.0.6-r1.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r1.ebuild
@@ -231,6 +231,9 @@ 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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2022-04-03  9:12 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2022-04-03  9:12 UTC (permalink / raw
  To: gentoo-commits

commit:     2e423952f285aa4b69b2d932d6e9881b20c16be2
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 09:10:31 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 09:11:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e423952

app-backup/bacula: add 11.0.6

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-11.0.6.ebuild | 413 +++++++++++++++++++++++++++++++++
 2 files changed, 414 insertions(+)

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

diff --git a/app-backup/bacula/bacula-11.0.6.ebuild b/app-backup/bacula/bacula-11.0.6.ebuild
new file mode 100644
index 000000000000..280ae3cb775c
--- /dev/null
+++ b/app-backup/bacula/bacula-11.0.6.ebuild
@@ -0,0 +1,413 @@
+# 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
+
+	# 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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-12-31  0:46 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2021-12-31  0:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e4aa7b0f3a740cde871813e3ec4004220e551514
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 00:45:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 00:45:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4aa7b0f

app-backup/bacula: Stabilize 11.0.5 ppc, #829865

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
index 5d25066cae53..dcf40a8e6d28 100644
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ b/app-backup/bacula/bacula-11.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+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="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-12-23 22:40 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2021-12-23 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     eb58ea6a9a1eb00b6a96ffe5309dc95b78c5bb0b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 23 22:40:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 22:40:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb58ea6a

app-backup/bacula: Stabilize 11.0.5 amd64, #829865

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
index e30eb0e9300f..5d25066cae53 100644
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ b/app-backup/bacula/bacula-11.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+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="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-12-23 22:39 Sam James
  0 siblings, 0 replies; 79+ messages in thread
From: Sam James @ 2021-12-23 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     341fa563545be7cb89748378e9bb137f29d18bbd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 23 22:39:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 22:39:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341fa563

app-backup/bacula: Stabilize 11.0.5 x86, #829865

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/bacula/bacula-11.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
index b2738be8a8a5..e30eb0e9300f 100644
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ b/app-backup/bacula/bacula-11.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+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="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-06-06  8:48 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2021-06-06  8:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b0ba9c2f7cb32d5f151ee7a5aca6623bf7260676
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 08:48:28 2021 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 08:48:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ba9c2f

app-backup/bacula: Minor maintenance release

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-11.0.5.ebuild | 413 +++++++++++++++++++++++++++++++++
 2 files changed, 414 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 4f553a41279..be60a8bdd62 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,5 +1,6 @@
 DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c
 DIST bacula-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540
+DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-05-26 16:59 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2021-05-26 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c8263c39c80190a18ac8add7d36def7648e960a1
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 16:59:03 2021 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed May 26 16:59:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8263c39

app-backup/bacula: Minor maintenance release

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

 app-backup/bacula/Manifest             |   1 +
 app-backup/bacula/bacula-11.0.3.ebuild | 413 +++++++++++++++++++++++++++++++++
 2 files changed, 414 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 23ed3ce5e00..4f553a41279 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,4 +1,5 @@
 DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c
+DIST bacula-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-05-18 16:36 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2021-05-18 16:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4942b57000c0f061cab2cdf74d73a65888917631
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 16:35:27 2021 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue May 18 16:36:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4942b570

app-backup/bacula: Fix Link with LLD

Closes: https://bugs.gentoo.org/732840
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/bacula-9.6.5.ebuild | 1 -
 app-backup/bacula/bacula-9.6.6.ebuild | 1 -
 app-backup/bacula/bacula-9.6.7.ebuild | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index d9cbcaee183..033903ff748 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -201,7 +201,6 @@ src_configure() {
 		$(use_enable batch-insert) \
 		$(use_enable !readline conio) \
 		$(use_enable readline) \
-		$(use_with readline readline /usr) \
 		$(use_with ssl openssl) \
 		$(use_enable ipv6) \
 		$(use_enable acl) \

diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
index d527ca5224e..83f72ca3178 100644
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -201,7 +201,6 @@ src_configure() {
 		$(use_enable batch-insert) \
 		$(use_enable !readline conio) \
 		$(use_enable readline) \
-		$(use_with readline readline /usr) \
 		$(use_with ssl openssl) \
 		$(use_enable ipv6) \
 		$(use_enable acl) \

diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
index d527ca5224e..83f72ca3178 100644
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -201,7 +201,6 @@ src_configure() {
 		$(use_enable batch-insert) \
 		$(use_enable !readline conio) \
 		$(use_enable readline) \
-		$(use_with readline readline /usr) \
 		$(use_with ssl openssl) \
 		$(use_enable ipv6) \
 		$(use_enable acl) \


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-04-30 18:03 Mikle Kolyada
  0 siblings, 0 replies; 79+ messages in thread
From: Mikle Kolyada @ 2021-04-30 18:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2fd2b65bd5f3bd8c2621fbc49e12f94c44904252
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 18:02:55 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 18:02:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd2b65b

app-backup/bacula: fix emptyline warning

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-backup/bacula/bacula-9.6.5.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 46893c1da0e..d9cbcaee183 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -154,7 +154,6 @@ src_prepare() {
 	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
 


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2021-04-30 17:32 Mikle Kolyada
  0 siblings, 0 replies; 79+ messages in thread
From: Mikle Kolyada @ 2021-04-30 17:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d96c852e80383965be441a23185bcfcf3e12e7ce
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 17:17:21 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 17:32:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96c852e

app-backup/bacula: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-backup/bacula/bacula-9.6.5.ebuild | 16 +++-------------
 app-backup/bacula/bacula-9.6.6.ebuild | 17 +++--------------
 app-backup/bacula/bacula-9.6.7.ebuild | 17 +++--------------
 3 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 13290a4abf9..46893c1da0e 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+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? (
@@ -40,8 +40,7 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
@@ -50,8 +49,7 @@ DEPEND="
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,14 +154,6 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
 
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die

diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
index aaffa58674b..d527ca5224e 100644
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+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? (
@@ -40,8 +40,7 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
@@ -50,8 +49,7 @@ DEPEND="
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die
 

diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
index aaffa58674b..d527ca5224e 100644
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+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? (
@@ -40,8 +40,7 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
@@ -50,8 +49,7 @@ DEPEND="
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die
 


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-12-13 18:27 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2020-12-13 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     5a1c0c28388e30a75cef07a303d6eef1b4f7464d
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 18:27:22 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 18:27:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1c0c28

app-backup/bacula: Maintenance release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.6.7.ebuild | 428 ++++++++++++++++++++++++++++++++++
 2 files changed, 429 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index da06b2fc455..a4201f8397c 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,2 +1,3 @@
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
+DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d

diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
new file mode 100644
index 00000000000..8b6104a81e9
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 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 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.6.3/${PN}-9.6.3-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	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 readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-09-26 13:46 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2020-09-26 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a2c51308026c61624cc0ad70115b208d3e00a166
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 13:46:05 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 13:46:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c51308

app-backup/bacula: Minor maintenance release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.6.6.ebuild | 428 ++++++++++++++++++++++++++++++++++
 2 files changed, 429 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index b043eabf262..da06b2fc455 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1 +1,2 @@
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
+DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a

diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
new file mode 100644
index 00000000000..8b6104a81e9
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 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 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.6.3/${PN}-9.6.3-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	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 readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-07-20  6:42 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2020-07-20  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9b9c795dc4e39e4c26bed43da40f08dc36ecd6e7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 06:40:40 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 06:40:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9c795d

app-backup/bacula: amd64 stable wrt bug #729718

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-9.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 8959462414c..d2d04673ea7 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-07-19  7:43 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2020-07-19  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     20e8b60622d86158b4b1349b3a24cfd24257769f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 07:43:42 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 07:43:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e8b606

app-backup/bacula: x86 stable wrt bug #729718

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-9.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 9456256ad40..8959462414c 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-07-17 15:09 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2020-07-17 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     71896f7e4752bf624c20eceb112b4273f85884dd
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 15:08:49 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 15:08:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71896f7e

app-backup/bacula: ppc stable wrt bug #729718

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-9.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 8b6104a81e9..9456256ad40 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-06-13 15:51 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2020-06-13 15:51 UTC (permalink / raw
  To: gentoo-commits

commit:     71e1918b116e34180c1dd91f4f008981da89b9b4
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 15:50:12 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 15:51:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e1918b

app-backup/bacula: Bugfix release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.6.5.ebuild | 428 ++++++++++++++++++++++++++++++++++
 2 files changed, 429 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 488dcaaba14..1ad79877304 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,2 +1,3 @@
 DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31
 DIST bacula-9.6.3.tar.gz 4246447 BLAKE2B c591fcd5a6c3a79b52cf778f7719ad59f35bfdf99293abb4f6e9c701c0d545125734721a926f071056433d7a9801c40c546f4a73770f5d0fea9fc33c334bcd93 SHA512 8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f
+DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70

diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
new file mode 100644
index 00000000000..8b6104a81e9
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 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 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.6.3/${PN}-9.6.3-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	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 readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-06-02 13:46 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2020-06-02 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     90d89edc09a124a7f1479e48257bc3f9ab9bf8f9
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 13:46:04 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 13:46:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d89edc

app-backup/bacula: Fix installation of bpipe-fd.so

Build system originally installs plugin library with mode 0750.
Fixed in new revision 9.4.4-r3 and 9.6.3-r1.

Reported-by: Phil Stracchino <phils <AT> caerllewys.net>
Closes: https://bugs.gentoo.org/725946
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/bacula-9.4.4-r3.ebuild | 429 +++++++++++++++++++++++++++++++
 app-backup/bacula/bacula-9.6.3-r1.ebuild | 428 ++++++++++++++++++++++++++++++
 2 files changed, 857 insertions(+)

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

diff --git a/app-backup/bacula/bacula-9.6.3-r1.ebuild b/app-backup/bacula/bacula-9.6.3-r1.ebuild
new file mode 100644
index 00000000000..55c0d02d3b8
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.3-r1.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	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 readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-03-25 16:51 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2020-03-25 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3fcd444f6718d054bbdfa1d47146c7bb807b9c10
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 16:50:43 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 16:51:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcd444f

app-backup/bacula: Fix MissingUseDepDefault QA message

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

 app-backup/bacula/bacula-9.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.6.3.ebuild b/app-backup/bacula/bacula-9.6.3.ebuild
index 4ad296b340a..604e97d35a8 100644
--- a/app-backup/bacula/bacula-9.6.3.ebuild
+++ b/app-backup/bacula/bacula-9.6.3.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
 		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs] )
+		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
 			!libressl? ( dev-libs/openssl:0=[static-libs] )
 			libressl? ( dev-libs/libressl:0=[static-libs] )


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-01-21 10:42 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2020-01-21 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8eacd29be64b563896544e199039cb2125e6c54a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 10:41:09 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 10:41:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eacd29b

app-backup/bacula: x86 stable wrt bug #705862

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-9.4.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild b/app-backup/bacula/bacula-9.4.4-r2.ebuild
index b2f837e497a..cc89bff9d0a 100644
--- a/app-backup/bacula/bacula-9.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-9.4.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-01-21 10:33 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2020-01-21 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     6f44e637c1c23f2c5c5fb50f06d6f2ec394e29b4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 10:33:48 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 10:33:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f44e637

app-backup/bacula: ppc stable wrt bug #705862

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-9.4.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild b/app-backup/bacula/bacula-9.4.4-r2.ebuild
index ab20f40726a..b2f837e497a 100644
--- a/app-backup/bacula/bacula-9.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-9.4.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2020-01-20 19:46 Agostino Sarubbo
  0 siblings, 0 replies; 79+ messages in thread
From: Agostino Sarubbo @ 2020-01-20 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     62f69e61b6f1702181ffc0479d6b773adc61e211
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 19:46:22 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 19:46:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f69e61

app-backup/bacula: amd64 stable wrt bug #705862

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/bacula/bacula-9.4.4-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild b/app-backup/bacula/bacula-9.4.4-r2.ebuild
index e10673ddc96..ab20f40726a 100644
--- a/app-backup/bacula/bacula-9.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-9.4.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-10-16  7:39 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2019-10-16  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4a03d9699b58529bdb5a33f9f747e98752e9ff7b
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 07:39:14 2019 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 07:39:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a03d969

app-backup/bacula: Migrate to GLEP 81

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

 app-backup/bacula/bacula-9.4.4-r2.ebuild | 429 +++++++++++++++++++++++++++++++
 1 file changed, 429 insertions(+)

diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild b/app-backup/bacula/bacula-9.4.4-r2.ebuild
new file mode 100644
index 00000000000..e10673ddc96
--- /dev/null
+++ b/app-backup/bacula/bacula-9.4.4-r2.ebuild
@@ -0,0 +1,429 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
+	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	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."
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-07-26 18:21 Georgy Yakovlev
  0 siblings, 0 replies; 79+ messages in thread
From: Georgy Yakovlev @ 2019-07-26 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2b01d2e3432deaca64119b152b7f42eb48271c72
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Fri Jul 26 15:04:40 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 18:21:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b01d2e3

app-backup/bacula: fix installing manpages for 9.4.4

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Joonas Niilola <juippis <AT> gmail.com>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-backup/bacula/bacula-9.4.4-r1.ebuild | 438 +++++++++++++++++++++++++++++++
 1 file changed, 438 insertions(+)

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-07-26 18:21 Georgy Yakovlev
  0 siblings, 0 replies; 79+ messages in thread
From: Georgy Yakovlev @ 2019-07-26 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     dcc01ad77fa509581393365cde645f9b44ae42e0
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Fri Jul 26 15:05:26 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 18:21:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc01ad7

app-backup/bacula: clean old 9.4.4

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Joonas Niilola <juippis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12092
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-backup/bacula/bacula-9.4.4.ebuild | 438 ----------------------------------
 1 file changed, 438 deletions(-)

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-07-26 18:21 Georgy Yakovlev
  0 siblings, 0 replies; 79+ messages in thread
From: Georgy Yakovlev @ 2019-07-26 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8cbad8c7c7d8d3710382b3f5d662af4483239f0f
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Fri May 24 03:09:50 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 18:21:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbad8c7

app-backup/bacula: fix installing manual page for bat-tool

Bug: https://bugs.gentoo.org/686118
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Joonas Niilola <juippis <AT> gmail.com>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-backup/bacula/bacula-9.2.2-r2.ebuild | 437 ++++++++++++++++++++++++++++++
 app-backup/bacula/bacula-9.4.1-r2.ebuild | 441 +++++++++++++++++++++++++++++++
 app-backup/bacula/bacula-9.4.2-r1.ebuild | 438 ++++++++++++++++++++++++++++++
 app-backup/bacula/bacula-9.4.3-r1.ebuild | 438 ++++++++++++++++++++++++++++++
 4 files changed, 1754 insertions(+)

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

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

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

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-07-26 18:21 Georgy Yakovlev
  0 siblings, 0 replies; 79+ messages in thread
From: Georgy Yakovlev @ 2019-07-26 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4609c721abbd8d983f413b13bfd37847fbc8c287
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Fri May 24 03:10:46 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 18:21:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4609c721

app-backup/bacula: clean old

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Joonas Niilola <juippis <AT> gmail.com>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-backup/bacula/bacula-9.2.2-r1.ebuild | 437 ------------------------------
 app-backup/bacula/bacula-9.4.1-r1.ebuild | 441 -------------------------------
 app-backup/bacula/bacula-9.4.2.ebuild    | 438 ------------------------------
 app-backup/bacula/bacula-9.4.3.ebuild    | 438 ------------------------------
 4 files changed, 1754 deletions(-)

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

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

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

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-05-31 16:27 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2019-05-31 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     7ce021da50e642293deebae1d1257140af67738c
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 16:26:18 2019 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri May 31 16:27:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ce021da

app-backup/bacula: bugfix release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.4.4.ebuild | 438 ++++++++++++++++++++++++++++++++++
 2 files changed, 439 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 066afa2e8f4..ecbc84f770f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -4,3 +4,4 @@ DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344
 DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332 SHA512 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee
 DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8 SHA512 f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d
 DIST bacula-9.4.3.tar.gz 4167892 BLAKE2B 058d51fa62f7a37ccb19d91c33589dd2d2a52ee2d17e82c5b5ce7b9f80f36ead81cd6cb4fafcfc269f4202a2a9f989106ade72efd673f89693f155c0f4a0b336 SHA512 042bf1b974ff60b054bd4a16ce93cd1d93b89d0b743f340c00cc4636922e1e25a38d97dc140bf5842859b3694736df2a812801747ced678610f8583e14ea5e81
+DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-05-11 12:27 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2019-05-11 12:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ecce28e06bf3936e706fa874a60c8483239333c2
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 12:26:39 2019 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat May 11 12:27:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecce28e0

app-backup/bacula: Add missing qt deps.

Thanks for the hint asturm.

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

 app-backup/bacula/bacula-9.0.8-r1.ebuild | 3 +++
 app-backup/bacula/bacula-9.2.2-r1.ebuild | 3 +++
 app-backup/bacula/bacula-9.4.1-r1.ebuild | 3 +++
 app-backup/bacula/bacula-9.4.2.ebuild    | 3 +++
 app-backup/bacula/bacula-9.4.3.ebuild    | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index 0ea0135150c..14a98bb221b 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -26,6 +26,9 @@ DEPEND="
 		!bacula-nodir? ( virtual/mta )
 	)
 	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
 		dev-qt/qtsvg:5
 		x11-libs/qwt:6
 	)

diff --git a/app-backup/bacula/bacula-9.2.2-r1.ebuild b/app-backup/bacula/bacula-9.2.2-r1.ebuild
index eedf7f28d1b..6e8635da494 100644
--- a/app-backup/bacula/bacula-9.2.2-r1.ebuild
+++ b/app-backup/bacula/bacula-9.2.2-r1.ebuild
@@ -26,6 +26,9 @@ DEPEND="
 	)
 	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
 	)

diff --git a/app-backup/bacula/bacula-9.4.1-r1.ebuild b/app-backup/bacula/bacula-9.4.1-r1.ebuild
index 7cd85d81e5c..750f5bddbfa 100644
--- a/app-backup/bacula/bacula-9.4.1-r1.ebuild
+++ b/app-backup/bacula/bacula-9.4.1-r1.ebuild
@@ -26,6 +26,9 @@ DEPEND="
 	)
 	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
 	)

diff --git a/app-backup/bacula/bacula-9.4.2.ebuild b/app-backup/bacula/bacula-9.4.2.ebuild
index 0ec8c9e2352..17ec8d24af3 100644
--- a/app-backup/bacula/bacula-9.4.2.ebuild
+++ b/app-backup/bacula/bacula-9.4.2.ebuild
@@ -26,6 +26,9 @@ DEPEND="
 	)
 	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
 	)

diff --git a/app-backup/bacula/bacula-9.4.3.ebuild b/app-backup/bacula/bacula-9.4.3.ebuild
index 0ec8c9e2352..17ec8d24af3 100644
--- a/app-backup/bacula/bacula-9.4.3.ebuild
+++ b/app-backup/bacula/bacula-9.4.3.ebuild
@@ -26,6 +26,9 @@ DEPEND="
 	)
 	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
 	)


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-05-11 12:27 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2019-05-11 12:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2d73b4e33ec9ebd689e73e3623ef7b2b8dafba89
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 12:23:03 2019 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat May 11 12:27:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d73b4e3

app-backup/bacula: Drop old

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

 app-backup/bacula/bacula-9.4.1.ebuild | 434 ----------------------------------
 1 file changed, 434 deletions(-)

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-05-11 10:45 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2019-05-11 10:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8ad1ca82cce905fa64e0179b38a6293d670f51fb
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 10:45:22 2019 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat May 11 10:45:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad1ca82

app-backup/bacula: Bugfix release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.4.3.ebuild | 435 ++++++++++++++++++++++++++++++++++
 2 files changed, 436 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index b8e11e5a2ab..066afa2e8f4 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -3,3 +3,4 @@ DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064
 DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8 SHA512 390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708
 DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332 SHA512 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee
 DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8 SHA512 f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d
+DIST bacula-9.4.3.tar.gz 4167892 BLAKE2B 058d51fa62f7a37ccb19d91c33589dd2d2a52ee2d17e82c5b5ce7b9f80f36ead81cd6cb4fafcfc269f4202a2a9f989106ade72efd673f89693f155c0f4a0b336 SHA512 042bf1b974ff60b054bd4a16ce93cd1d93b89d0b743f340c00cc4636922e1e25a38d97dc140bf5842859b3694736df2a812801747ced678610f8583e14ea5e81

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-04-20  1:29 Aaron Bauman
  0 siblings, 0 replies; 79+ messages in thread
From: Aaron Bauman @ 2019-04-20  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     bade4e272133a81ead90dc78d8f5e194e76ff9f3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 14 11:57:31 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 01:28:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bade4e27

app-backup/bacula: use HTTPS

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11678
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 app-backup/bacula/bacula-5.2.13-r7.ebuild | 4 ++--
 app-backup/bacula/bacula-9.0.6-r4.ebuild  | 4 ++--
 app-backup/bacula/bacula-9.0.8-r1.ebuild  | 4 ++--
 app-backup/bacula/bacula-9.2.1.ebuild     | 4 ++--
 app-backup/bacula/bacula-9.2.2-r1.ebuild  | 4 ++--
 app-backup/bacula/bacula-9.2.2.ebuild     | 4 ++--
 app-backup/bacula/bacula-9.4.1-r1.ebuild  | 2 +-
 app-backup/bacula/bacula-9.4.1.ebuild     | 4 ++--
 app-backup/bacula/bacula-9.4.2.ebuild     | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r7.ebuild b/app-backup/bacula/bacula-5.2.13-r7.ebuild
index 5c90175fbb9..5f8d6be9621 100644
--- a/app-backup/bacula/bacula-5.2.13-r7.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.0.6-r4.ebuild b/app-backup/bacula/bacula-9.0.6-r4.ebuild
index bda740bbcd9..f67ebadf714 100644
--- a/app-backup/bacula/bacula-9.0.6-r4.ebuild
+++ b/app-backup/bacula/bacula-9.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index d37bd4142af..0ea0135150c 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.2.1.ebuild b/app-backup/bacula/bacula-9.2.1.ebuild
index d29d8013339..7078d302e01 100644
--- a/app-backup/bacula/bacula-9.2.1.ebuild
+++ b/app-backup/bacula/bacula-9.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.2.2-r1.ebuild b/app-backup/bacula/bacula-9.2.2-r1.ebuild
index 584865827b1..eedf7f28d1b 100644
--- a/app-backup/bacula/bacula-9.2.2-r1.ebuild
+++ b/app-backup/bacula/bacula-9.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.2.2.ebuild b/app-backup/bacula/bacula-9.2.2.ebuild
index 4d4577e24ba..df22d058de9 100644
--- a/app-backup/bacula/bacula-9.2.2.ebuild
+++ b/app-backup/bacula/bacula-9.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.4.1-r1.ebuild b/app-backup/bacula/bacula-9.4.1-r1.ebuild
index e777f2a550f..7cd85d81e5c 100644
--- a/app-backup/bacula/bacula-9.4.1-r1.ebuild
+++ b/app-backup/bacula/bacula-9.4.1-r1.ebuild
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.4.1.ebuild b/app-backup/bacula/bacula-9.4.1.ebuild
index c65e3c14a6f..470df2887e2 100644
--- a/app-backup/bacula/bacula-9.4.1.ebuild
+++ b/app-backup/bacula/bacula-9.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"

diff --git a/app-backup/bacula/bacula-9.4.2.ebuild b/app-backup/bacula/bacula-9.4.2.ebuild
index b342f18eb77..0ec8c9e2352 100644
--- a/app-backup/bacula/bacula-9.4.2.ebuild
+++ b/app-backup/bacula/bacula-9.4.2.ebuild
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2019-02-14  6:25 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2019-02-14  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     8bed25393d89484c4979b1906f5ae9f03b7bc4de
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 06:25:35 2019 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 06:25:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bed2539

app-backup/bacula: Maintenance release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.4.2.ebuild | 435 ++++++++++++++++++++++++++++++++++
 2 files changed, 436 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 2d831a9fdb3..c935ac838f9 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -4,3 +4,4 @@ DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064
 DIST bacula-9.2.1.tar.gz 4115337 BLAKE2B 17c678bee46c9788d9abf220d0c810f94864f9f1609fc25513b2cf0a11ac584fc2ca4429fa49d7af567d316b92c243900bed21511b59f8976fd230186896c70f SHA512 6b14372fb505a4c5e084b96154c764b20e173504e335813cfffd406eb1739a301a5352047696501a11fcc297381a9fbed6e0e8714ad62998f02edbd9e0ff8d1b
 DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8 SHA512 390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708
 DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332 SHA512 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee
+DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8 SHA512 f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-12-08 18:59 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-12-08 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     585b758c33cc02c8bc2a494bcc9c43ce81c99b08
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 18:58:51 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 18:58:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585b758c

app-backup/bacula: Fix wrong handling for new batch-insert USE flag.

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

 app-backup/bacula/bacula-9.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.2.2-r1.ebuild b/app-backup/bacula/bacula-9.2.2-r1.ebuild
index 019a34fdab1..584865827b1 100644
--- a/app-backup/bacula/bacula-9.2.2-r1.ebuild
+++ b/app-backup/bacula/bacula-9.2.2-r1.ebuild
@@ -218,7 +218,7 @@ src_configure() {
 
 	myconf="${myconf} \
 		$(use_with X x) \
-		$(use_with batch-insert) \
+		$(use_enable batch-insert) \
 		$(use_enable !readline conio) \
 		$(use_enable readline) \
 		$(use_with readline readline /usr) \


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-12-07 15:43 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-12-07 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b7c9719f45e95defe57d1c24ef6902aa0f913d32
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 15:40:49 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 15:42:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c9719f

app-backup/bacula: Reenable batch insert into mysql data base.

Using batch insert can now be controlled by an USE flag.

Suggested-by: Ortwin Glueck <odi <AT> odi.ch>
Closes: https://bugs.gentoo.org/671222
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/bacula-9.2.2-r1.ebuild | 434 +++++++++++++++++++++++++++++++
 app-backup/bacula/metadata.xml           |   1 +
 2 files changed, 435 insertions(+)

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

diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
index 1ebf5f232fa..ed8ab4a8542 100644
--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/metadata.xml
@@ -10,6 +10,7 @@
 			client</flag>
 		<flag name="bacula-nodir">Disable building of director</flag>
 		<flag name="bacula-nosd">Disable building of storage daemon</flag>
+		<flag name="batch-insert">Enable batch insert into data base</flag>
 		<flag name="logwatch">Install support files for logwatch</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-11-10 14:44 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-11-10 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     9f9252d681e3267bd4d7a3f8f2dbde25daba7eaa
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 14:42:20 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 14:44:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9252d6

app-backup/bacula: Minor maintance release

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

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.2.2.ebuild | 440 ++++++++++++++++++++++++++++++++++
 2 files changed, 441 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 837e1b87168..b03ff94b9e2 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -2,3 +2,4 @@ DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b0
 DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
 DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937 SHA512 4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64
 DIST bacula-9.2.1.tar.gz 4115337 BLAKE2B 17c678bee46c9788d9abf220d0c810f94864f9f1609fc25513b2cf0a11ac584fc2ca4429fa49d7af567d316b92c243900bed21511b59f8976fd230186896c70f SHA512 6b14372fb505a4c5e084b96154c764b20e173504e335813cfffd406eb1739a301a5352047696501a11fcc297381a9fbed6e0e8714ad62998f02edbd9e0ff8d1b
+DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8 SHA512 390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-11-10  8:42 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-11-10  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     39d6815af220f8ff74307ef428b526258f955c6e
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 08:41:40 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 08:41:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39d6815a

app-backup/bacula: Drop old with virtual/mysql dep (bug #665818)

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

 app-backup/bacula/bacula-9.0.6-r2.ebuild | 427 -------------------------------
 1 file changed, 427 deletions(-)

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-11-07 22:59 Sergei Trofimovich
  0 siblings, 0 replies; 79+ messages in thread
From: Sergei Trofimovich @ 2018-11-07 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     6b4cfdf7af92c491d61e6a55f0f30714a63526c2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 22:52:07 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 22:59:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b4cfdf7

app-backup/bacula: stable 9.0.8-r1 for ppc, bug #669872

Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-backup/bacula/bacula-9.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index 3cda7394faf..d37bd4142af 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-11-05 18:15 Mikle Kolyada
  0 siblings, 0 replies; 79+ messages in thread
From: Mikle Kolyada @ 2018-11-05 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     510f82b06acc6c37b86bab58519ad268364a9479
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  5 18:14:57 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Nov  5 18:14:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510f82b0

app-backup/bacula: amd64 stable wrt bug #669872

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-backup/bacula/bacula-9.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index 99cacd67cf8..3cda7394faf 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-10-28 23:39 Thomas Deutschmann
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Deutschmann @ 2018-10-28 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     cea4c252da7f8b04a298338d6d4f34b95d921de4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 23:38:52 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 23:39:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea4c252

app-backup/bacula: x86 stable (bug #669872)

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-backup/bacula/bacula-9.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index f3069cfd596..99cacd67cf8 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-10-28 10:17 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-10-28 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d2b35fde10972efd81dfecff150b5bc2355b1b6f
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 10:16:39 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 10:16:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b35fde

app-backup/bacula: Drop old

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

 app-backup/bacula/bacula-5.2.13-r6.ebuild | 397 ---------------------------
 app-backup/bacula/bacula-9.0.6-r3.ebuild  | 436 ------------------------------
 app-backup/bacula/bacula-9.0.8.ebuild     | 434 -----------------------------
 3 files changed, 1267 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r6.ebuild b/app-backup/bacula/bacula-5.2.13-r6.ebuild
deleted file mode 100644
index 463523e8d36..00000000000
--- a/app-backup/bacula/bacula-5.2.13-r6.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit eutils multilib python-single-r1 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 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 )
-	)
-	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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				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; 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
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' 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 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
-
-	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}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# 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*
-	rm -vf "${D}"/usr/share/man/man1/bat.1*
-	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
-
-	einfo
-	einfo "This Revision 6 of bacula-5.2.13 dropped support for building 'bat' as"
-	einfo "Qt4 is not longer supported by Gentoo. Please use it only for installations"
-	einfo "requiring an old file demon."
-	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
-	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."
-	einfo
-}

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

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-10-28 10:14 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-10-28 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     01193cbf016e898ab1b07fb17333c1d2d4c37bb4
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 10:05:16 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 10:13:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01193cbf

app-backup/bacula: Revbumps to replace virtual/mysql

Closes: https://bugs.gentoo.org/665818

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

 app-backup/bacula/bacula-5.2.13-r7.ebuild | 397 +++++++++++++++++++++++++++
 app-backup/bacula/bacula-9.0.6-r4.ebuild  | 436 ++++++++++++++++++++++++++++++
 app-backup/bacula/bacula-9.0.8-r1.ebuild  | 434 +++++++++++++++++++++++++++++
 3 files changed, 1267 insertions(+)

diff --git a/app-backup/bacula/bacula-5.2.13-r7.ebuild b/app-backup/bacula/bacula-5.2.13-r7.ebuild
new file mode 100644
index 00000000000..5c90175fbb9
--- /dev/null
+++ b/app-backup/bacula/bacula-5.2.13-r7.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 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 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	dev-libs/gmp:0
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( dev-db/mysql-connector-c:= )
+		sqlite? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				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; 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
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' 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 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
+
+	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}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# 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*
+	rm -vf "${D}"/usr/share/man/man1/bat.1*
+	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
+
+	einfo
+	einfo "This Revision 6 of bacula-5.2.13 dropped support for building 'bat' as"
+	einfo "Qt4 is not longer supported by Gentoo. Please use it only for installations"
+	einfo "requiring an old file demon."
+	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
+	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."
+	einfo
+}

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

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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-05-11 17:46 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-05-11 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     7c3ad668a4f0093af54847e2810a5948a99602d9
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 17:44:43 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri May 11 17:46:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3ad668

app-backup/bacula: Drop old versions depending on Qt4

ppc and sparc project gave ack for not having to wait for stabilization
of bacula-9.0.6-r2 (bug #651078, comment 4)

Bugs: https://bugs.gentoo.org/644566
Closes: https://bugs.gentoo.org/651078
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-backup/bacula/Manifest                |   4 -
 app-backup/bacula/bacula-5.2.13-r5.ebuild | 424 -----------------------------
 app-backup/bacula/bacula-7.4.4-r2.ebuild  | 412 -----------------------------
 app-backup/bacula/bacula-7.4.6.ebuild     | 412 -----------------------------
 app-backup/bacula/bacula-7.4.7.ebuild     | 412 -----------------------------
 app-backup/bacula/bacula-9.0.3.ebuild     | 418 -----------------------------
 app-backup/bacula/bacula-9.0.6-r1.ebuild  | 426 ------------------------------
 app-backup/bacula/bacula-9.0.6.ebuild     | 418 -----------------------------
 8 files changed, 2926 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 53d995e50e4..b7e56cf079d 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,6 +1,2 @@
 DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0
-DIST bacula-7.4.4.tar.gz 3312271 BLAKE2B 9c68a3e0d2b610bb65137d15533de272eda2ffc22ba6e73ff9b8631a5d8ca45fc5595928eeb28a577a8e055ccaf82d275424c756b7f4abf9690175b20c75d847 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029
-DIST bacula-7.4.6.tar.gz 3312673 BLAKE2B d614b3b58970cfeda2de66108c8663a7f42da8302ac6b19c77a70a81830b5f93c13913dd930d3a35abfbc6910a7dd4757f4ed2a9a2ac70ea3bb5ec0ca986038a SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7
-DIST bacula-7.4.7.tar.gz 3312991 BLAKE2B 5ce6306613ac649e0e4fff97d967f174640c3c478a408f003e031a265c83a8b28b3212fa798d9724759c45f2efa5b7c3a5edc607f1be9e3e3d1bfb4d94bfe854 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0
-DIST bacula-9.0.3.tar.gz 3951688 BLAKE2B ca7972ff6910f63ae4eb4b828322d9137534462b57fbbac9e110d02795a46d9186d1877e7a17b4c08d671e12ee35c7cf025fbe034c865e5eeeac10c01303a246 SHA512 025cdcc3d92f2674cda7ed2f7d050a8826daf71d0f435d2b34b2514d3f03ab09a299a1882d9d9d51134445f8ba71bb38dc3fabf12d28877604a1b88d92623f7f
 DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e

diff --git a/app-backup/bacula/bacula-5.2.13-r5.ebuild b/app-backup/bacula/bacula-5.2.13-r5.ebuild
deleted file mode 100644
index f69c8982110..00000000000
--- a/app-backup/bacula/bacula-5.2.13-r5.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				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
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' 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.4-r2.ebuild b/app-backup/bacula/bacula-7.4.4-r2.ebuild
deleted file mode 100644
index d707c4c8d81..00000000000
--- a/app-backup/bacula/bacula-7.4.4-r2.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use 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
-
-	# fix soname in libbaccat.so bug #602952
-	epatch "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 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.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild
deleted file mode 100644
index 8b30c32e777..00000000000
--- a/app-backup/bacula/bacula-7.4.6.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use 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
-
-	# fix soname in libbaccat.so bug #602952
-	epatch "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	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 /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	if ! use 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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 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.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild
deleted file mode 100644
index 8b30c32e777..00000000000
--- a/app-backup/bacula/bacula-7.4.7.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use 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
-
-	# fix soname in libbaccat.so bug #602952
-	epatch "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	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 /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	if ! use 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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 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-9.0.3.ebuild b/app-backup/bacula/bacula-9.0.3.ebuild
deleted file mode 100644
index 0d286e64589..00000000000
--- a/app-backup/bacula/bacula-9.0.3.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="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? (
-		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? (
-		virtual/acl
-		sys-libs/zlib
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use 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}"/9.0.2/${PN}-9.0.2-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}"/9.0.2/${PN}-9.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	epatch "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	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}"
-		if use mysql; then
-		    myconf="${myconf} \
-			--disable-batch-insert"
-		else
-		    myconf="${myconf} \
-			--enable-batch-insert"
-		fi
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable 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_with tcpd tcp-wrappers)"
-
-	econf \
-	    --enable-acl \
-		--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 /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	if ! use 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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}

diff --git a/app-backup/bacula/bacula-9.0.6-r1.ebuild b/app-backup/bacula/bacula-9.0.6-r1.ebuild
deleted file mode 100644
index df095b52d30..00000000000
--- a/app-backup/bacula/bacula-9.0.6-r1.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit qmake-utils desktop systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="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 qt5 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 )
-	)
-	qt5? (
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		acl? ( virtual/acl )
-		sys-libs/zlib
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-
-	if ! use bacula-clientonly; then
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.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
-
-	# fix file not found error during make depend
-	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-	# fix missing QtGlobal include in src/qt-console/pages.h for Qt5
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.patch
-	eapply_user
-
-	# build 'bat' for Qt5
-	export QT_SELECT=qt5
-
-	# 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}"
-		if use mysql; then
-		    myconf="${myconf} \
-			--disable-batch-insert"
-		else
-		    myconf="${myconf} \
-			--enable-batch-insert"
-		fi
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--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_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--host=${CHOST} \
-		${myconf}
-
-	# correct configuration for QT based bat
-	if use qt5 ; then
-		pushd src/qt-console
-		eqmake5
-		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 qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-}

diff --git a/app-backup/bacula/bacula-9.0.6.ebuild b/app-backup/bacula/bacula-9.0.6.ebuild
deleted file mode 100644
index 4cbd1b5794b..00000000000
--- a/app-backup/bacula/bacula-9.0.6.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use 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}"/9.0.2/${PN}-9.0.2-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}"/9.0.2/${PN}-9.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	epatch "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	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}"
-		if use mysql; then
-		    myconf="${myconf} \
-			--disable-batch-insert"
-		else
-		    myconf="${myconf} \
-			--enable-batch-insert"
-		fi
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable 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 /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	if ! use 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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-05-11 16:37 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2018-05-11 16:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c6a11f48cf7e4a10694bb52c1e11899cc27bcb42
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 16:35:29 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri May 11 16:36:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a11f48

app-backup/bacula: Revbump with dropped Qt4 support.

Can be used as client for older bacula server installations.

Bug: https://bugs.gentoo.org/651078
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-backup/bacula/bacula-5.2.13-r6.ebuild | 397 ++++++++++++++++++++++++++++++
 1 file changed, 397 insertions(+)

diff --git a/app-backup/bacula/bacula-5.2.13-r6.ebuild b/app-backup/bacula/bacula-5.2.13-r6.ebuild
new file mode 100644
index 00000000000..463523e8d36
--- /dev/null
+++ b/app-backup/bacula/bacula-5.2.13-r6.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 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 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 )
+	)
+	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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				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; 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
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' 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 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
+
+	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}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# 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*
+	rm -vf "${D}"/usr/share/man/man1/bat.1*
+	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
+
+	einfo
+	einfo "This Revision 6 of bacula-5.2.13 dropped support for building 'bat' as"
+	einfo "Qt4 is not longer supported by Gentoo. Please use it only for installations"
+	einfo "requiring an old file demon."
+	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
+	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."
+	einfo
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2018-03-26 19:55 Mikle Kolyada
  0 siblings, 0 replies; 79+ messages in thread
From: Mikle Kolyada @ 2018-03-26 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     1c381afae6b5c2903d629868a969df26aa4d22b0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 19:55:11 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 19:55:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c381afa

app-backup/bacula: amd64 stable wrt bug #651078

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-backup/bacula/bacula-9.0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bacula/bacula-9.0.6-r2.ebuild b/app-backup/bacula/bacula-9.0.6-r2.ebuild
index ee84ae457c0..114a9ebd4b4 100644
--- a/app-backup/bacula/bacula-9.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-9.0.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2017-12-17 16:46 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2017-12-17 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     fb6be82700a05abe41a8677823cdb75d52fffb3f
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 16:46:22 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 16:46:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6be827

app-backup/bacula: Version bump

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-9.0.6.ebuild | 418 ++++++++++++++++++++++++++++++++++
 2 files changed, 419 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index ea31d43deee..53d995e50e4 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -3,3 +3,4 @@ DIST bacula-7.4.4.tar.gz 3312271 BLAKE2B 9c68a3e0d2b610bb65137d15533de272eda2ffc
 DIST bacula-7.4.6.tar.gz 3312673 BLAKE2B d614b3b58970cfeda2de66108c8663a7f42da8302ac6b19c77a70a81830b5f93c13913dd930d3a35abfbc6910a7dd4757f4ed2a9a2ac70ea3bb5ec0ca986038a SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7
 DIST bacula-7.4.7.tar.gz 3312991 BLAKE2B 5ce6306613ac649e0e4fff97d967f174640c3c478a408f003e031a265c83a8b28b3212fa798d9724759c45f2efa5b7c3a5edc607f1be9e3e3d1bfb4d94bfe854 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0
 DIST bacula-9.0.3.tar.gz 3951688 BLAKE2B ca7972ff6910f63ae4eb4b828322d9137534462b57fbbac9e110d02795a46d9186d1877e7a17b4c08d671e12ee35c7cf025fbe034c865e5eeeac10c01303a246 SHA512 025cdcc3d92f2674cda7ed2f7d050a8826daf71d0f435d2b34b2514d3f03ab09a299a1882d9d9d51134445f8ba71bb38dc3fabf12d28877604a1b88d92623f7f
+DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e

diff --git a/app-backup/bacula/bacula-9.0.6.ebuild b/app-backup/bacula/bacula-9.0.6.ebuild
new file mode 100644
index 00000000000..4cbd1b5794b
--- /dev/null
+++ b/app-backup/bacula/bacula-9.0.6.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				static? ( bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use 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}"/9.0.2/${PN}-9.0.2-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}"/9.0.2/${PN}-9.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	epatch "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	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}"
+		if use mysql; then
+		    myconf="${myconf} \
+			--disable-batch-insert"
+		else
+		    myconf="${myconf} \
+			--enable-batch-insert"
+		fi
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable 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 /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use 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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt4'."
+	einfo
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2017-08-11  4:45 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2017-08-11  4:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2970b617dd703212a7df15196b109e91f7d71dee
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 04:44:32 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 04:44:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2970b617

app-backup/bacula: Fix overcomplex REQUIRED_USE (bug #622402)

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-backup/bacula/bacula-5.2.13-r5.ebuild | 4 ++--
 app-backup/bacula/bacula-7.0.5-r1.ebuild  | 4 ++--
 app-backup/bacula/bacula-7.0.5-r2.ebuild  | 4 ++--
 app-backup/bacula/bacula-7.4.4-r2.ebuild  | 2 +-
 app-backup/bacula/bacula-7.4.6.ebuild     | 2 +-
 app-backup/bacula/bacula-7.4.7.ebuild     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r5.ebuild b/app-backup/bacula/bacula-5.2.13-r5.ebuild
index 6156233041d..f69c8982110 100644
--- a/app-backup/bacula/bacula-5.2.13-r5.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 				static? ( bacula-clientonly )
 				python? ( ${PYTHON_REQUIRED_USE} )"
 

diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild b/app-backup/bacula/bacula-7.0.5-r1.ebuild
index 2c6b14e115c..b1ca466cc16 100644
--- a/app-backup/bacula/bacula-7.0.5-r1.ebuild
+++ b/app-backup/bacula/bacula-7.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 				static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.0.5-r2.ebuild b/app-backup/bacula/bacula-7.0.5-r2.ebuild
index 5f07f3aaf9f..cd88dc439ad 100644
--- a/app-backup/bacula/bacula-7.0.5-r2.ebuild
+++ b/app-backup/bacula/bacula-7.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 				static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.4.4-r2.ebuild b/app-backup/bacula/bacula-7.4.4-r2.ebuild
index fa9b3957979..d707c4c8d81 100644
--- a/app-backup/bacula/bacula-7.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-7.4.4-r2.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 				static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.4.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild
index ccbfb526096..8b30c32e777 100644
--- a/app-backup/bacula/bacula-7.4.6.ebuild
+++ b/app-backup/bacula/bacula-7.4.6.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 				static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.4.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild
index ccbfb526096..8b30c32e777 100644
--- a/app-backup/bacula/bacula-7.4.7.ebuild
+++ b/app-backup/bacula/bacula-7.4.7.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 				static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2017-07-04  7:07 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2017-07-04  7:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b214bb1bcbe9289965e413ef7978136212ce37f0
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 07:07:01 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 07:07:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b214bb1b

app-backup/bacula: Fix installation with USE=logwatch (bug #617918). Tnx A. Kochov.

New bacula treis to decide wether to install in old logwatch's /etc/log.d directory
or to newer /etc/logwatch but fails to do it correctly.
Adapt install path to gentoos logwatch default.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-backup/bacula/bacula-7.4.6.ebuild | 8 ++++----
 app-backup/bacula/bacula-7.4.7.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-backup/bacula/bacula-7.4.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild
index 0f853396fd1..ccbfb526096 100644
--- a/app-backup/bacula/bacula-7.4.6.ebuild
+++ b/app-backup/bacula/bacula-7.4.6.ebuild
@@ -272,10 +272,10 @@ src_install() {
 		# 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
+			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

diff --git a/app-backup/bacula/bacula-7.4.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild
index 0f853396fd1..ccbfb526096 100644
--- a/app-backup/bacula/bacula-7.4.7.ebuild
+++ b/app-backup/bacula/bacula-7.4.7.ebuild
@@ -272,10 +272,10 @@ src_install() {
 		# 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
+			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


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2017-04-24 10:39 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2017-04-24 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     81167900a1223b4a49a8fec01cdfb625aef486ae
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 10:39:17 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 10:39:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81167900

app-backup/bacula: minor maintenance release

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.7.ebuild | 412 ++++++++++++++++++++++++++++++++++
 2 files changed, 413 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 548cc5575cc..b6af185c225 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -2,3 +2,4 @@ DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9
 DIST bacula-7.4.6.tar.gz 3312673 SHA256 4e8ea321b64cd49e29aecbdd3cb0dc10615302b18e2f26ffa7e7c82362c1cfed SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7 WHIRLPOOL d8831459a8f70a8a6b3b03b6b366ac62181ab2241f9bbf9fad46df95df1923873ec32795dd382c2c3fe66170b573d2ed54802e3784a47beed33aefd17ab84417
+DIST bacula-7.4.7.tar.gz 3312991 SHA256 6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0 WHIRLPOOL bc897086f8589d952c6b9dad7751278d21be5e51d9bbcfd2c697f95191ca1295127bb0f06b98c1f05a13e9f7cd0ef61ce7aba87f3cd8d0503168114c9ad96c93

diff --git a/app-backup/bacula/bacula-7.4.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild
new file mode 100644
index 00000000000..0f853396fd1
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.7.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+	# fix soname in libbaccat.so bug #602952
+	epatch "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2017-03-12  8:34 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2017-03-12  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0b676ab13eab222f633ada335967dbc5d748f6b9
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 08:34:30 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 08:34:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b676ab1

app-backup/bacula: Maintenance and bugfix release

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.6.ebuild | 412 ++++++++++++++++++++++++++++++++++
 2 files changed, 413 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 33f5cc72390..548cc5575cc 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1,4 @@
 DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9
+DIST bacula-7.4.6.tar.gz 3312673 SHA256 4e8ea321b64cd49e29aecbdd3cb0dc10615302b18e2f26ffa7e7c82362c1cfed SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7 WHIRLPOOL d8831459a8f70a8a6b3b03b6b366ac62181ab2241f9bbf9fad46df95df1923873ec32795dd382c2c3fe66170b573d2ed54802e3784a47beed33aefd17ab84417

diff --git a/app-backup/bacula/bacula-7.4.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild
new file mode 100644
index 00000000000..0f853396fd1
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.6.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+	# fix soname in libbaccat.so bug #602952
+	epatch "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2017-03-12  8:34 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2017-03-12  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     cf6d69403c2b3c8db4dd36b551d229a375ac6474
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 08:31:59 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 08:31:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6d6940

app-backup/bacula: Drop old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-backup/bacula/Manifest               |   1 -
 app-backup/bacula/bacula-7.4.3-r1.ebuild | 412 -------------------------------
 app-backup/bacula/bacula-7.4.3.ebuild    | 409 ------------------------------
 app-backup/bacula/bacula-7.4.4-r1.ebuild | 409 ------------------------------
 app-backup/bacula/bacula-7.4.4.ebuild    | 409 ------------------------------
 5 files changed, 1640 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 1f4324af941..33f5cc72390 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,4 +1,3 @@
 DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
-DIST bacula-7.4.3.tar.gz 3311152 SHA256 597db51997fcdb4c8bdc201f2dc22b466e69152bc2945e2222a27f4ffaeba5bc SHA512 2fe5e852a77e6e1db8ea2d71909646d0e1ff164b5ef792c149cb8ce80ce790086a9f34ec31c126ce7d161d5c6f74dc27fe3ccf34fe62c08077c72a02c3d23ded WHIRLPOOL d606bb79451e0d982be0528d1c71a5c8167890f639efbdc28758818bd0e3cba7416b86c0559887652f4c9e029ea981a498d275998a1a1450379e3e911256b90d
 DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9

diff --git a/app-backup/bacula/bacula-7.4.3-r1.ebuild b/app-backup/bacula/bacula-7.4.3-r1.ebuild
deleted file mode 100644
index e04803e6fe0..00000000000
--- a/app-backup/bacula/bacula-7.4.3-r1.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
-	# fix soname in libbaccat.so bug #602952
-	epatch "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	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.3.ebuild b/app-backup/bacula/bacula-7.4.3.ebuild
deleted file mode 100644
index 9b6145f2113..00000000000
--- a/app-backup/bacula/bacula-7.4.3.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.4-r1.ebuild b/app-backup/bacula/bacula-7.4.4-r1.ebuild
deleted file mode 100644
index c00ffdafa2e..00000000000
--- a/app-backup/bacula/bacula-7.4.4-r1.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 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.4.ebuild b/app-backup/bacula/bacula-7.4.4.ebuild
deleted file mode 100644
index 4fff512e4f0..00000000000
--- a/app-backup/bacula/bacula-7.4.4.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-11-09 10:57 Michael Palimaka
  0 siblings, 0 replies; 79+ messages in thread
From: Michael Palimaka @ 2016-11-09 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b68a8cf4787121978f479f2a11197b289e727411
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  9 10:57:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  9 10:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68a8cf4

app-backup/bacula: remove unused Manifest entries

Package-Manager: portage-2.3.2

 app-backup/bacula/Manifest | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 6e19769..1f4324a 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,7 +1,4 @@
 DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
-DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d
-DIST bacula-7.4.1.tar.gz 3310144 SHA256 d0874e94c0534274455efd91d6f9477c57c7f14882138f03b3572eff2660e861 SHA512 38d03d437c43fea18160ec9e1d0367e08dca3831bc90b52c2f357cc47da4d4cd00bbfdadad4cd61c684c7729a99c76dd153d00bd3b581e91fc485a7480d35e8a WHIRLPOOL 5c6708ff00ee83580c56e2979865f66864c5eca9fe67fecdbf3537eac357d6737d147002e76d193ea90db7c842bb58feb944043ab18b75072caef717ecbb8f9d
-DIST bacula-7.4.2.tar.gz 3311355 SHA256 0c5f7fe1d35fc2aa4ffba73e977b710b955b1fe3e45ab90c67b47b279152ad67 SHA512 50b04666f759a6b5a37708478851f3439d027c670adf1e44827350eb26de8caab4e5f8bf1bd0f4b784bd2576067d0c1cc9da3627499d14130583296b22f504bd WHIRLPOOL 6a9f6313f8629a9c8b0c67757762a8e6bf2717351f20a4db080c80b6237b75993023a2a967be79f55107eafbe00186da5cc3253293ab078d9433d234987c2ac8
 DIST bacula-7.4.3.tar.gz 3311152 SHA256 597db51997fcdb4c8bdc201f2dc22b466e69152bc2945e2222a27f4ffaeba5bc SHA512 2fe5e852a77e6e1db8ea2d71909646d0e1ff164b5ef792c149cb8ce80ce790086a9f34ec31c126ce7d161d5c6f74dc27fe3ccf34fe62c08077c72a02c3d23ded WHIRLPOOL d606bb79451e0d982be0528d1c71a5c8167890f639efbdc28758818bd0e3cba7416b86c0559887652f4c9e029ea981a498d275998a1a1450379e3e911256b90d
 DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-09-23 11:09 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-09-23 11:09 UTC (permalink / raw
  To: gentoo-commits

commit:     adcae57463bf55b38268bd9ec65819c95b037509
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 11:08:39 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 11:08:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcae574

app-backup/bacula: Maintenance release

Package-Manager: portage-2.3.1

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.4.ebuild | 410 ++++++++++++++++++++++++++++++++++
 2 files changed, 411 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 26a5d1f..6e19769 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -4,3 +4,4 @@ DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121
 DIST bacula-7.4.1.tar.gz 3310144 SHA256 d0874e94c0534274455efd91d6f9477c57c7f14882138f03b3572eff2660e861 SHA512 38d03d437c43fea18160ec9e1d0367e08dca3831bc90b52c2f357cc47da4d4cd00bbfdadad4cd61c684c7729a99c76dd153d00bd3b581e91fc485a7480d35e8a WHIRLPOOL 5c6708ff00ee83580c56e2979865f66864c5eca9fe67fecdbf3537eac357d6737d147002e76d193ea90db7c842bb58feb944043ab18b75072caef717ecbb8f9d
 DIST bacula-7.4.2.tar.gz 3311355 SHA256 0c5f7fe1d35fc2aa4ffba73e977b710b955b1fe3e45ab90c67b47b279152ad67 SHA512 50b04666f759a6b5a37708478851f3439d027c670adf1e44827350eb26de8caab4e5f8bf1bd0f4b784bd2576067d0c1cc9da3627499d14130583296b22f504bd WHIRLPOOL 6a9f6313f8629a9c8b0c67757762a8e6bf2717351f20a4db080c80b6237b75993023a2a967be79f55107eafbe00186da5cc3253293ab078d9433d234987c2ac8
 DIST bacula-7.4.3.tar.gz 3311152 SHA256 597db51997fcdb4c8bdc201f2dc22b466e69152bc2945e2222a27f4ffaeba5bc SHA512 2fe5e852a77e6e1db8ea2d71909646d0e1ff164b5ef792c149cb8ce80ce790086a9f34ec31c126ce7d161d5c6f74dc27fe3ccf34fe62c08077c72a02c3d23ded WHIRLPOOL d606bb79451e0d982be0528d1c71a5c8167890f639efbdc28758818bd0e3cba7416b86c0559887652f4c9e029ea981a498d275998a1a1450379e3e911256b90d
+DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9

diff --git a/app-backup/bacula/bacula-7.4.4.ebuild b/app-backup/bacula/bacula-7.4.4.ebuild
new file mode 100644
index 00000000..da822d4
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.4.ebuild
@@ -0,0 +1,410 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-07-24 10:11 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-07-24 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     266e94976b837845ca1397420d8011b09236866d
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 10:10:00 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 10:10:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266e9497

app-backup/bacula: bugfix release for coming gcc-6

Package-Manager: portage-2.3.0

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.3.ebuild | 410 ++++++++++++++++++++++++++++++++++
 2 files changed, 411 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index becf2b9..26a5d1f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -3,3 +3,4 @@ DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51
 DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d
 DIST bacula-7.4.1.tar.gz 3310144 SHA256 d0874e94c0534274455efd91d6f9477c57c7f14882138f03b3572eff2660e861 SHA512 38d03d437c43fea18160ec9e1d0367e08dca3831bc90b52c2f357cc47da4d4cd00bbfdadad4cd61c684c7729a99c76dd153d00bd3b581e91fc485a7480d35e8a WHIRLPOOL 5c6708ff00ee83580c56e2979865f66864c5eca9fe67fecdbf3537eac357d6737d147002e76d193ea90db7c842bb58feb944043ab18b75072caef717ecbb8f9d
 DIST bacula-7.4.2.tar.gz 3311355 SHA256 0c5f7fe1d35fc2aa4ffba73e977b710b955b1fe3e45ab90c67b47b279152ad67 SHA512 50b04666f759a6b5a37708478851f3439d027c670adf1e44827350eb26de8caab4e5f8bf1bd0f4b784bd2576067d0c1cc9da3627499d14130583296b22f504bd WHIRLPOOL 6a9f6313f8629a9c8b0c67757762a8e6bf2717351f20a4db080c80b6237b75993023a2a967be79f55107eafbe00186da5cc3253293ab078d9433d234987c2ac8
+DIST bacula-7.4.3.tar.gz 3311152 SHA256 597db51997fcdb4c8bdc201f2dc22b466e69152bc2945e2222a27f4ffaeba5bc SHA512 2fe5e852a77e6e1db8ea2d71909646d0e1ff164b5ef792c149cb8ce80ce790086a9f34ec31c126ce7d161d5c6f74dc27fe3ccf34fe62c08077c72a02c3d23ded WHIRLPOOL d606bb79451e0d982be0528d1c71a5c8167890f639efbdc28758818bd0e3cba7416b86c0559887652f4c9e029ea981a498d275998a1a1450379e3e911256b90d

diff --git a/app-backup/bacula/bacula-7.4.3.ebuild b/app-backup/bacula/bacula-7.4.3.ebuild
new file mode 100644
index 0000000..da822d4
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.3.ebuild
@@ -0,0 +1,410 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-07-11 15:27 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-07-11 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1be820c93d0816b24d18cff592c260a0d8969fce
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 15:26:41 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 15:26:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be820c9

app-backup/bacula: Maintenance release

Package-Manager: portage-2.3.0

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.2.ebuild | 410 ++++++++++++++++++++++++++++++++++
 2 files changed, 411 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 4ec14f4..becf2b9 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -2,3 +2,4 @@ DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d
 DIST bacula-7.4.1.tar.gz 3310144 SHA256 d0874e94c0534274455efd91d6f9477c57c7f14882138f03b3572eff2660e861 SHA512 38d03d437c43fea18160ec9e1d0367e08dca3831bc90b52c2f357cc47da4d4cd00bbfdadad4cd61c684c7729a99c76dd153d00bd3b581e91fc485a7480d35e8a WHIRLPOOL 5c6708ff00ee83580c56e2979865f66864c5eca9fe67fecdbf3537eac357d6737d147002e76d193ea90db7c842bb58feb944043ab18b75072caef717ecbb8f9d
+DIST bacula-7.4.2.tar.gz 3311355 SHA256 0c5f7fe1d35fc2aa4ffba73e977b710b955b1fe3e45ab90c67b47b279152ad67 SHA512 50b04666f759a6b5a37708478851f3439d027c670adf1e44827350eb26de8caab4e5f8bf1bd0f4b784bd2576067d0c1cc9da3627499d14130583296b22f504bd WHIRLPOOL 6a9f6313f8629a9c8b0c67757762a8e6bf2717351f20a4db080c80b6237b75993023a2a967be79f55107eafbe00186da5cc3253293ab078d9433d234987c2ac8

diff --git a/app-backup/bacula/bacula-7.4.2.ebuild b/app-backup/bacula/bacula-7.4.2.ebuild
new file mode 100644
index 0000000..da822d4
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.2.ebuild
@@ -0,0 +1,410 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-07-06  4:53 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-07-06  4:53 UTC (permalink / raw
  To: gentoo-commits

commit:     88fb507e14e0212a5902e019fd4a10b7b1b1f913
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 04:52:39 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 04:52:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fb507e

app-backup/bacula: Backport fixes from bug #584442 to let bacula-dir start under systemd

Package-Manager: portage-2.3.0

 app-backup/bacula/bacula-5.2.13-r5.ebuild | 425 ++++++++++++++++++++++++++++++
 app-backup/bacula/bacula-7.0.5-r2.ebuild  | 405 ++++++++++++++++++++++++++++
 2 files changed, 830 insertions(+)

diff --git a/app-backup/bacula/bacula-5.2.13-r5.ebuild b/app-backup/bacula/bacula-5.2.13-r5.ebuild
new file mode 100644
index 0000000..127e393
--- /dev/null
+++ b/app-backup/bacula/bacula-5.2.13-r5.ebuild
@@ -0,0 +1,425 @@
+# 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
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' 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.0.5-r2.ebuild b/app-backup/bacula/bacula-7.0.5-r2.ebuild
new file mode 100644
index 0000000..ecd445c
--- /dev/null
+++ b/app-backup/bacula/bacula-7.0.5-r2.ebuild
@@ -0,0 +1,405 @@
+# 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 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? ( dev-libs/openssl:0[static-libs] )
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? ( dev-libs/openssl: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}"/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
+
+	# 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.0.2/${PN}-7.0.2-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 tmpfiles config for client-only (no bacula user) install
+	# NOTE: Change only first occurance (user) not second (group)
+	# bug 528398
+	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} \
+		$(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 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-07-05 17:44 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-07-05 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     dc6fb390998723001869c19f0253daaa3b1db4d7
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 17:44:02 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 17:44:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6fb390

app-backup/bacula: Cleanup old versions and revisions

Package-Manager: portage-2.3.0

 app-backup/bacula/Manifest                |   1 -
 app-backup/bacula/bacula-5.2.13-r3.ebuild | 416 ------------------------------
 app-backup/bacula/bacula-7.2.0.ebuild     | 407 -----------------------------
 3 files changed, 824 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 5f73667..4ec14f4 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,5 +1,4 @@
 DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
-DIST bacula-7.2.0.tar.gz 3301720 SHA256 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c SHA512 ff50db48039c9040d4995f53a8d83ad6e5568da254527d07cfe450bf0e4a25717387b5e4aa9f29197c284f513240e714c48d8232d7d7edb9159afbc13cd0cd54 WHIRLPOOL 17f5b19a6fb9bf2a05e79663c7810358cf79aebad7f2709a01fadf15d5d494a243290e9c66e30c8b9bde6a627e238b77c1853a0d40891c5f5f4b390ae0ded1e5
 DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d
 DIST bacula-7.4.1.tar.gz 3310144 SHA256 d0874e94c0534274455efd91d6f9477c57c7f14882138f03b3572eff2660e861 SHA512 38d03d437c43fea18160ec9e1d0367e08dca3831bc90b52c2f357cc47da4d4cd00bbfdadad4cd61c684c7729a99c76dd153d00bd3b581e91fc485a7480d35e8a WHIRLPOOL 5c6708ff00ee83580c56e2979865f66864c5eca9fe67fecdbf3537eac357d6737d147002e76d193ea90db7c842bb58feb944043ab18b75072caef717ecbb8f9d

diff --git a/app-backup/bacula/bacula-5.2.13-r3.ebuild b/app-backup/bacula/bacula-5.2.13-r3.ebuild
deleted file mode 100644
index 76d1241..0000000
--- a/app-backup/bacula/bacula-5.2.13-r3.ebuild
+++ /dev/null
@@ -1,416 +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 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.2.0.ebuild b/app-backup/bacula/bacula-7.2.0.ebuild
deleted file mode 100644
index a757466..0000000
--- a/app-backup/bacula/bacula-7.2.0.ebuild
+++ /dev/null
@@ -1,407 +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 has changed."
-		ewarn "If you just upgraded you must run '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
-}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-06-25 13:15 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-06-25 13:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9458fe0ebc541ed7f685db00c02d4558bd2cb1b8
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 13:13:57 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 13:15:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9458fe0e

app-backup/bacula: Maintenance release

Package-Manager: portage-2.3.0

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.1.ebuild | 410 ++++++++++++++++++++++++++++++++++
 2 files changed, 411 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index fb06b5b..5f73667 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -2,3 +2,4 @@ DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.2.0.tar.gz 3301720 SHA256 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c SHA512 ff50db48039c9040d4995f53a8d83ad6e5568da254527d07cfe450bf0e4a25717387b5e4aa9f29197c284f513240e714c48d8232d7d7edb9159afbc13cd0cd54 WHIRLPOOL 17f5b19a6fb9bf2a05e79663c7810358cf79aebad7f2709a01fadf15d5d494a243290e9c66e30c8b9bde6a627e238b77c1853a0d40891c5f5f4b390ae0ded1e5
 DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d
+DIST bacula-7.4.1.tar.gz 3310144 SHA256 d0874e94c0534274455efd91d6f9477c57c7f14882138f03b3572eff2660e861 SHA512 38d03d437c43fea18160ec9e1d0367e08dca3831bc90b52c2f357cc47da4d4cd00bbfdadad4cd61c684c7729a99c76dd153d00bd3b581e91fc485a7480d35e8a WHIRLPOOL 5c6708ff00ee83580c56e2979865f66864c5eca9fe67fecdbf3537eac357d6737d147002e76d193ea90db7c842bb58feb944043ab18b75072caef717ecbb8f9d

diff --git a/app-backup/bacula/bacula-7.4.1.ebuild b/app-backup/bacula/bacula-7.4.1.ebuild
new file mode 100644
index 0000000..da822d4
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.1.ebuild
@@ -0,0 +1,410 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-06-23  5:25 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-06-23  5:25 UTC (permalink / raw
  To: gentoo-commits

commit:     2d32617fcfaecd8258c683de77f1e0c6676ce05a
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 05:25:18 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 05:25:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d32617f

app-backup/bacula: Let bacula-dir start successful under systemd (Bug #584442)

Change systemd's bacula-dir.service so that bacula-dir is run as root:bacula.
While not perfect from a security point it makes bacula under systemd
compatible with OpenRC environment.

Package-Manager: portage-2.3.0_rc1

 app-backup/bacula/bacula-7.4.0-r1.ebuild | 410 +++++++++++++++++++++++++++++++
 1 file changed, 410 insertions(+)

diff --git a/app-backup/bacula/bacula-7.4.0-r1.ebuild b/app-backup/bacula/bacula-7.4.0-r1.ebuild
new file mode 100644
index 0000000..da822d4
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.0-r1.ebuild
@@ -0,0 +1,410 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-06-16 18:32 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-06-16 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c5c8ad32fa368f586c6262fac2ad2327b1f1fc2a
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 18:29:52 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 18:31:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c8ad32

app-backup/bacula: Backport fix for systemd temfile for bacula-clientonly

Backport from bacula-7.0.5-r1.
Fixes Bug 577486. Thanks for reporting alunduil <AT> gentoo.org.

Package-Manager: portage-2.3.0_rc1

 app-backup/bacula/bacula-5.2.13-r4.ebuild | 423 ++++++++++++++++++++++++++++++
 1 file changed, 423 insertions(+)

diff --git a/app-backup/bacula/bacula-5.2.13-r4.ebuild b/app-backup/bacula/bacula-5.2.13-r4.ebuild
new file mode 100644
index 0000000..13ed8fe
--- /dev/null
+++ b/app-backup/bacula/bacula-5.2.13-r4.ebuild
@@ -0,0 +1,423 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-03-22  0:53 Anthony G. Basile
  0 siblings, 0 replies; 79+ messages in thread
From: Anthony G. Basile @ 2016-03-22  0:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3d618a1757c7264483103008a4e026bc1b314ba6
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:53:00 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:53:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d618a17

app-backup/bacula: add libressl support

Package-Manager: portage-2.2.26

 app-backup/bacula/bacula-5.2.13-r3.ebuild | 14 ++++++++++----
 app-backup/bacula/bacula-7.2.0.ebuild     | 12 +++++++++---
 app-backup/bacula/bacula-7.4.0.ebuild     | 12 +++++++++---
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r3.ebuild b/app-backup/bacula/bacula-5.2.13-r3.ebuild
index 724f29b..76d1241 100644
--- a/app-backup/bacula/bacula-5.2.13-r3.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r3.ebuild
@@ -18,8 +18,8 @@ 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 logwatch mysql postgres python qt4 readline +sqlite ssl static tcpd vim-syntax X"
+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
@@ -41,14 +41,20 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		ssl? ( dev-libs/openssl:0[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? ( dev-libs/openssl:0 )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
 	)
 	python? ( ${PYTHON_DEPS} )
 	"

diff --git a/app-backup/bacula/bacula-7.2.0.ebuild b/app-backup/bacula/bacula-7.2.0.ebuild
index df443eb..a757466 100644
--- a/app-backup/bacula/bacula-7.2.0.ebuild
+++ b/app-backup/bacula/bacula-7.2.0.ebuild
@@ -16,7 +16,7 @@ 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 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
+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
@@ -38,14 +38,20 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		ssl? ( dev-libs/openssl:0[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? ( dev-libs/openssl:0 )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
 	)"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (

diff --git a/app-backup/bacula/bacula-7.4.0.ebuild b/app-backup/bacula/bacula-7.4.0.ebuild
index 3303bfb..3be2523 100644
--- a/app-backup/bacula/bacula-7.4.0.ebuild
+++ b/app-backup/bacula/bacula-7.4.0.ebuild
@@ -16,7 +16,7 @@ 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 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
+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
@@ -38,14 +38,20 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		ssl? ( dev-libs/openssl:0[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? ( dev-libs/openssl:0 )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
 	)"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-02-02 21:00 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-02-02 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a29ba2f7c15e89551f6f59faec44c18a63e38ed6
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 17:32:56 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 20:56:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29ba2f7

app-backup/bacula: Drop old

Package-Manager: portage-2.2.27

 app-backup/bacula/Manifest               |   1 -
 app-backup/bacula/bacula-5.0.3-r4.ebuild | 381 -------------------------------
 2 files changed, 382 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index bf59f2b..f88d16d 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,4 +1,3 @@
-DIST bacula-5.0.3.tar.gz 3800556 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4 SHA512 feb4a7333b4c898aec175c6e8b45ce5d4eb6e15100a9f27c6010e1a17b44133b7d181d25419e923321d8bd7147d85342bf1e0dca8387d6e9cd269a0e2fec4626 WHIRLPOOL 65a900cc740a300b509a02d953ec5265e3cfbd2ce85d8e40b47e1f1fdd6d77885ec48e68471cc559accd6707fdd9f1cbb34fba22371e806d404abed052a168fb
 DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.2.0.tar.gz 3301720 SHA256 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c SHA512 ff50db48039c9040d4995f53a8d83ad6e5568da254527d07cfe450bf0e4a25717387b5e4aa9f29197c284f513240e714c48d8232d7d7edb9159afbc13cd0cd54 WHIRLPOOL 17f5b19a6fb9bf2a05e79663c7810358cf79aebad7f2709a01fadf15d5d494a243290e9c66e30c8b9bde6a627e238b77c1853a0d40891c5f5f4b390ae0ded1e5

diff --git a/app-backup/bacula/bacula-5.0.3-r4.ebuild b/app-backup/bacula/bacula-5.0.3-r4.ebuild
deleted file mode 100644
index 10565ef..0000000
--- a/app-backup/bacula/bacula-5.0.3-r4.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2015 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 user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-#DOC_VER="${MY_PV}"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-#		doc? ( ${DOC_SRC_URI} )
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite ssl static tcpd vim-syntax X"
-
-# maintainer comment:
-# postgresql-base should have USE=threads (see bug 326333) but fails to build
-# atm with it (see bug #300964)
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!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-4.1 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		sys-libs/ncurses[static-libs]
-		ssl? ( dev-libs/openssl[static-libs] )
-	)
-	!static? (
-		acl? ( virtual/acl )
-		sys-libs/zlib
-		sys-libs/ncurses
-		ssl? ( dev-libs/openssl )
-	)
-	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
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/${PV}/${P}-doc.patch
-
-	# bug #310087
-	epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/${PV}/${P}-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/${PV}/${P}-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
-
-	epatch "${FILESDIR}"/${PV}/${P}-fix-static.patch
-
-	# fix CVE-2012-4430
-	epatch "${FILESDIR}"/${PV}/${P}-cve.patch
-
-	# 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-scriptdir=/usr/libexec/bacula \
-		--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 when enabled (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		dosbin "${S}"/src/qt-console/.libs/bat
-		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
-
-	# 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
-
-	# 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
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-02-02 21:00 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-02-02 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     8cb86c2b1f84c5f4734c9948f72a4c8a2f34802e
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 20:59:48 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 20:59:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb86c2b

app-backup/bacula: Version bump

Package-Manager: portage-2.2.27

 app-backup/bacula/Manifest            |   1 +
 app-backup/bacula/bacula-7.4.0.ebuild | 402 ++++++++++++++++++++++++++++++++++
 2 files changed, 403 insertions(+)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index f88d16d..fb06b5b 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1,4 @@
 DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.2.0.tar.gz 3301720 SHA256 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c SHA512 ff50db48039c9040d4995f53a8d83ad6e5568da254527d07cfe450bf0e4a25717387b5e4aa9f29197c284f513240e714c48d8232d7d7edb9159afbc13cd0cd54 WHIRLPOOL 17f5b19a6fb9bf2a05e79663c7810358cf79aebad7f2709a01fadf15d5d494a243290e9c66e30c8b9bde6a627e238b77c1853a0d40891c5f5f4b390ae0ded1e5
+DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d

diff --git a/app-backup/bacula/bacula-7.4.0.ebuild b/app-backup/bacula/bacula-7.4.0.ebuild
new file mode 100644
index 0000000..3303bfb
--- /dev/null
+++ b/app-backup/bacula/bacula-7.4.0.ebuild
@@ -0,0 +1,402 @@
+# 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 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? ( dev-libs/openssl:0[static-libs] )
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? ( dev-libs/openssl: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
+}


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2016-02-02 21:00 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2016-02-02 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a8cea8ac69d7124b1fe3445511f56f1fda76a790
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 18:14:03 2016 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 20:57:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cea8ac

app-backup/bacula: Add slot dependencies

Package-Manager: portage-2.2.27

 app-backup/bacula/bacula-5.2.13-r3.ebuild | 16 ++++++++--------
 app-backup/bacula/bacula-7.0.5-r1.ebuild  | 16 ++++++++--------
 app-backup/bacula/bacula-7.2.0.ebuild     | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r3.ebuild b/app-backup/bacula/bacula-5.2.13-r3.ebuild
index 933fc97..724f29b 100644
--- a/app-backup/bacula/bacula-5.2.13-r3.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,9 +22,9 @@ KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres python qt4 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
-	dev-libs/gmp
+	dev-libs/gmp:0
 	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql[threads] )
+		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
@@ -35,20 +35,20 @@ DEPEND="
 	)
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
+	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? ( dev-libs/openssl[static-libs] )
+		sys-libs/ncurses:=[static-libs]
+		ssl? ( dev-libs/openssl:0[static-libs] )
 	)
 	!static? (
 		acl? ( virtual/acl )
 		sys-libs/zlib
 		dev-libs/lzo
-		sys-libs/ncurses
-		ssl? ( dev-libs/openssl )
+		sys-libs/ncurses:=
+		ssl? ( dev-libs/openssl:0 )
 	)
 	python? ( ${PYTHON_DEPS} )
 	"

diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild b/app-backup/bacula/bacula-7.0.5-r1.ebuild
index e4f77ed..f25dd74 100644
--- a/app-backup/bacula/bacula-7.0.5-r1.ebuild
+++ b/app-backup/bacula/bacula-7.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,9 +19,9 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
-	dev-libs/gmp
+	dev-libs/gmp:0
 	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql[threads] )
+		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
@@ -32,20 +32,20 @@ DEPEND="
 	)
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
+	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? ( dev-libs/openssl[static-libs] )
+		sys-libs/ncurses:=[static-libs]
+		ssl? ( dev-libs/openssl:0[static-libs] )
 	)
 	!static? (
 		acl? ( virtual/acl )
 		sys-libs/zlib
 		dev-libs/lzo
-		sys-libs/ncurses
-		ssl? ( dev-libs/openssl )
+		sys-libs/ncurses:=
+		ssl? ( dev-libs/openssl:0 )
 	)"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (

diff --git a/app-backup/bacula/bacula-7.2.0.ebuild b/app-backup/bacula/bacula-7.2.0.ebuild
index 77a260b..df443eb 100644
--- a/app-backup/bacula/bacula-7.2.0.ebuild
+++ b/app-backup/bacula/bacula-7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,9 +19,9 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
-	dev-libs/gmp
+	dev-libs/gmp:0
 	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql[threads] )
+		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
@@ -32,20 +32,20 @@ DEPEND="
 	)
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
+	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? ( dev-libs/openssl[static-libs] )
+		sys-libs/ncurses:=[static-libs]
+		ssl? ( dev-libs/openssl:0[static-libs] )
 	)
 	!static? (
 		acl? ( virtual/acl )
 		sys-libs/zlib
 		dev-libs/lzo
-		sys-libs/ncurses
-		ssl? ( dev-libs/openssl )
+		sys-libs/ncurses:=
+		ssl? ( dev-libs/openssl:0 )
 	)"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (


^ permalink raw reply related	[flat|nested] 79+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
@ 2015-09-06  9:07 Thomas Beierlein
  0 siblings, 0 replies; 79+ messages in thread
From: Thomas Beierlein @ 2015-09-06  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     19622007489bc5aef2de2216f498d0c2e52fa300
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 09:04:53 2015 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 09:04:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19622007

app-backup/bacula: Drop refrence to deleted bacula.conf.in (bug# 559616). Thanks for reporting c1pher.

Package-Manager: portage-2.2.20.1

 app-backup/bacula/bacula-7.2.0.ebuild | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app-backup/bacula/bacula-7.2.0.ebuild b/app-backup/bacula/bacula-7.2.0.ebuild
index a5eb41f..77a260b 100644
--- a/app-backup/bacula/bacula-7.2.0.ebuild
+++ b/app-backup/bacula/bacula-7.2.0.ebuild
@@ -143,13 +143,6 @@ src_prepare() {
 	# 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
-	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 autoconf and gives errors during elibtoolize.


^ permalink raw reply related	[flat|nested] 79+ messages in thread

end of thread, other threads:[~2024-10-21 20:02 UTC | newest]

Thread overview: 79+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-12  3:38 [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/ Jorge Manuel B. S. Vicetto
  -- strict thread matches above, loose matches on Subject: below --
2024-10-21 20:02 Thomas Beierlein
2024-02-19 16:18 Thomas Beierlein
2024-01-12  8:28 Arthur Zamarin
2023-12-19  5:08 Sam James
2023-09-18 10:54 Sam James
2023-06-28  7:37 Sam James
2023-05-12  5:58 Thomas Beierlein
2023-04-30 11:52 Thomas Beierlein
2023-03-29 19:45 Sam James
2023-02-24 21:28 Thomas Beierlein
2023-02-24 19:20 Thomas Beierlein
2022-08-11  9:54 Thomas Beierlein
2022-07-07  6:35 Agostino Sarubbo
2022-07-07  6:34 Agostino Sarubbo
2022-05-21 11:15 Thomas Beierlein
2022-04-03  9:12 Thomas Beierlein
2021-12-31  0:46 Sam James
2021-12-23 22:40 Sam James
2021-12-23 22:39 Sam James
2021-06-06  8:48 Thomas Beierlein
2021-05-26 16:59 Thomas Beierlein
2021-05-18 16:36 Thomas Beierlein
2021-04-30 18:03 Mikle Kolyada
2021-04-30 17:32 Mikle Kolyada
2020-12-13 18:27 Thomas Beierlein
2020-09-26 13:46 Thomas Beierlein
2020-07-20  6:42 Agostino Sarubbo
2020-07-19  7:43 Agostino Sarubbo
2020-07-17 15:09 Agostino Sarubbo
2020-06-13 15:51 Thomas Beierlein
2020-06-02 13:46 Thomas Beierlein
2020-03-25 16:51 Thomas Beierlein
2020-01-21 10:42 Agostino Sarubbo
2020-01-21 10:33 Agostino Sarubbo
2020-01-20 19:46 Agostino Sarubbo
2019-10-16  7:39 Thomas Beierlein
2019-07-26 18:21 Georgy Yakovlev
2019-07-26 18:21 Georgy Yakovlev
2019-07-26 18:21 Georgy Yakovlev
2019-07-26 18:21 Georgy Yakovlev
2019-05-31 16:27 Thomas Beierlein
2019-05-11 12:27 Thomas Beierlein
2019-05-11 12:27 Thomas Beierlein
2019-05-11 10:45 Thomas Beierlein
2019-04-20  1:29 Aaron Bauman
2019-02-14  6:25 Thomas Beierlein
2018-12-08 18:59 Thomas Beierlein
2018-12-07 15:43 Thomas Beierlein
2018-11-10 14:44 Thomas Beierlein
2018-11-10  8:42 Thomas Beierlein
2018-11-07 22:59 Sergei Trofimovich
2018-11-05 18:15 Mikle Kolyada
2018-10-28 23:39 Thomas Deutschmann
2018-10-28 10:17 Thomas Beierlein
2018-10-28 10:14 Thomas Beierlein
2018-05-11 17:46 Thomas Beierlein
2018-05-11 16:37 Thomas Beierlein
2018-03-26 19:55 Mikle Kolyada
2017-12-17 16:46 Thomas Beierlein
2017-08-11  4:45 Thomas Beierlein
2017-07-04  7:07 Thomas Beierlein
2017-04-24 10:39 Thomas Beierlein
2017-03-12  8:34 Thomas Beierlein
2017-03-12  8:34 Thomas Beierlein
2016-11-09 10:57 Michael Palimaka
2016-09-23 11:09 Thomas Beierlein
2016-07-24 10:11 Thomas Beierlein
2016-07-11 15:27 Thomas Beierlein
2016-07-06  4:53 Thomas Beierlein
2016-07-05 17:44 Thomas Beierlein
2016-06-25 13:15 Thomas Beierlein
2016-06-23  5:25 Thomas Beierlein
2016-06-16 18:32 Thomas Beierlein
2016-03-22  0:53 Anthony G. Basile
2016-02-02 21:00 Thomas Beierlein
2016-02-02 21:00 Thomas Beierlein
2016-02-02 21:00 Thomas Beierlein
2015-09-06  9:07 Thomas Beierlein

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox