Prune FILESDIR (BUG #344011) from redundant files. Drop old unstable versions.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

29 files changed, 46 insertions, 1665 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 375a7c7cb17b..50eb47553860 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-backup/bacula
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.113 2011/03/06 09:15:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.114 2011/05/14 09:28:46 tomjbe Exp $
+
+  14 May 2011; Thomas Beierlein <tomjbe@gentoo.org>
+  -files/5.0.1/bacula-5.0.1-as-needed.patch,
+  -files/5.0.1/bacula-5.0.1-lib-search-path.patch,
+  -files/5.0.1/bacula-5.0.1-ncurses.patch, -bacula-5.0.3.ebuild,
+  -files/5.0.1/bacula-dir.confd, bacula-5.0.3-r3.ebuild,
+  -files/5.0.1/bacula-dir.initd, -files/5.0.1/bacula-fd.confd,
+  -files/5.0.1/bacula-fd.initd, -files/5.0.1/bacula-sd.confd,
+  -files/5.0.1/bacula-sd.initd, -files/5.0.2/bacula-dir.confd,
+  -files/5.0.2/bacula-dir.initd, -files/5.0.2/bacula-fd.confd,
+  -files/5.0.2/bacula-fd.initd, -files/5.0.2/bacula-sd.confd,
+  -files/5.0.2/bacula-sd.initd, -files/5.0.3/bacula-dir.confd,
+  -files/5.0.3/bacula-dir.initd, -files/5.0.3/bacula-fd.confd,
+  -files/5.0.3/bacula-fd.initd, -files/5.0.3/bacula-sd.confd,
+  -files/5.0.3/bacula-sd.initd, -bacula-5.0.1-r2.ebuild,
+  bacula-5.0.2-r1.ebuild, -bacula-5.0.2-r2.ebuild, bacula-5.0.3-r1.ebuild,
+  bacula-5.0.3-r2.ebuild, +files/bacula-dir.confd, +files/bacula-dir.initd,
+  +files/bacula-fd.confd, +files/bacula-fd.initd, +files/bacula-sd.confd,
+  +files/bacula-sd.initd:
+  Prune FILESDIR (BUG #344011) from redundant files. Drop old unstable
+  versions.
 
   06 Mar 2011; Justin Lecher <jlec@gentoo.org> bacula-5.0.1-r2.ebuild,
   bacula-5.0.2-r1.ebuild, bacula-5.0.2-r2.ebuild, bacula-5.0.3.ebuild,
diff --git a/app-backup/bacula/bacula-5.0.1-r2.ebuild b/app-backup/bacula/bacula-5.0.1-r2.ebuild
deleted file mode 100644
index e809e12a786c..000000000000
--- a/app-backup/bacula/bacula-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,495 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.1-r2.ebuild,v 1.4 2011/03/06 09:15:29 jlec Exp $
-
-EAPI="2"
-inherit eutils multilib
-
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd X"
-# bacula-web bimagemgr brestore bweb
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-#DOC_VER="${MY_PV}"
-#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
-#GUI_VER="${PV}"
-#GUI_SRC_URI="mirror://sourceforge/bacula/${PN}-gui-${GUI_VER}.tar.gz"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-#		doc? ( ${DOC_SRC_URI} )
-#		bacula-web? ( ${GUI_SRC_URI} )
-#		bimagemgr? ( ${GUI_SRC_URI} )
-#		brestore? ( ${GUI_SRC_URI} )
-#		bweb? ( ${GUI_SRC_URI} )
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		!bacula-nodir? (
-			postgres? ( dev-db/postgresql-server )
-			mysql? ( virtual/mysql )
-			sqlite3? ( dev-db/sqlite:3 )
-			virtual/mta
-		)
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sys-libs/ncurses
-	python? ( dev-lang/python[threads] )"
-#	doc? (
-#		app-text/ghostscript-gpl
-#		dev-tex/latex2html[png]
-#		app-text/dvipdfm
-#	)
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)"
-
-pkg_setup() {
-	local dbnum
-	declare -i dbnum=0
-	if ! use bacula-clientonly; then
-		if use mysql; then
-			export mydbtype=mysql
-			let dbnum++
-		fi
-		if use postgres; then
-			export mydbtype=postgresql
-			let dbnum++
-		fi
-		if use sqlite3; then
-			export mydbtype=sqlite3
-			let dbnum++
-		fi
-		if [[ "${dbnum}" -lt 1 ]]; then
-			eerror
-			eerror "To use ${P} it is required to set a database in the USE flags."
-			eerror "Supported databases are mysql, postgresql, sqlite3"
-			eerror
-			die "No database type selected."
-		elif [[ "${dbnum}" -gt 1 ]]; then
-			eerror
-			eerror "You have set ${P} to use multiple database types."
-			eerror "I don't know which to set as the default!"
-			eerror "You can use /etc/portage/package.use to set per-package USE flags"
-			eerror "Set it so only one database type, mysql, postgres, sqlite3"
-			eerror
-			die "Multiple database types selected."
-		fi
-	fi
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula || die
-		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 || die
-			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 #310087
-	epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
-
-	# switch from -ltermcap to -lncurses.
-	# we have to regenerate the configure script
-	# and eautoreconf does not work due to the
-	# sick bacula autoconf/autotools file location
-	# in ./autoconf/ instead of ./
-	epatch "${FILESDIR}"/${PV}/${P}-ncurses.patch \
-		&& econf --enable-client-only \
-		&& make configure \
-		|| die "making configure failed"
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable static static-tools) \
-			$(use_enable static static-fd) \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		if ! use bacula-nodir; then
-			myconf="${myconf} \
-				--with-${mydbtype} \
-				--enable-batch-insert \
-				$(use_enable static static-dir)"
-		fi
-		if ! use bacula-nosd; then
-			myconf="${myconf} $(use_enable static static-sd)"
-		fi
-	fi
-
-	if use qt4 && has_version '<x11-libs/qwt-5'; then
-		eerror "x11-libs/qwt found in a version < 5, thus the"
-		eerror "compilation of 'bat' would fail (see"
-		eerror "http://bugs.gentoo.org/188477#c11 for details)."
-		eerror "please either unmerge <x11-libs/qwt-5 or disable"
-		eerror "the qt4 USE flag to disable building 'bat'."
-		die "incompatible slotted qwt version found"
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_enable qt4 bat) \
-		$(use_enable static static-cons)
-		$(use_with python) \
-		$(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 \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--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 \
-		--host=${CHOST} \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# build various GUIs from bacula-gui tarball
-#	if use bacula-web || use bimagemgr || use brestore || use bweb; then
-#		pushd "${WORKDIR}/${PN}-gui-${GUI_VER}"
-#		local myconf_gui=''
-#		if use bimagemgr; then
-#			## TODO FIXME: webapp-config? !apache?
-#			myconf_gui="${myconf_gui} \
-#				--with-bimagemgr-cgidir=/var/www/localhost/cgi-bin \
-#				--with-bimagemgr-docdir=/var/www/localhost/htdocs \
-#				--with-bimagemgr-binowner=root \
-#				--with-bimagemgr-bingroup=root \
-#				--with-bimagemgr-dataowner=apache \
-#				--with-bimagemgr-datagroup=apache \
-#				"
-#		fi
-#		./configure \
-#			--with-bacula="${S}" \
-#			${myconf} \
-#			|| die "configure for bacula-gui failed"
-#		## TODO FIXME: install files (see bacula-gui.spec)
-#		if use bacula-web; then
-#			: install
-#		fi
-#		if use bimagemgr; then
-#			: install
-#		fi
-#		if use brestore; then
-#			: install
-#		fi
-#		if use bweb; then
-#			: install
-#		fi
-#		popd
-#	fi
-
-	# build docs from bacula-docs tarball
-#	if use doc; then
-#		pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
-#		./configure \
-#			--with-bacula="${S}" \
-#			|| die "configure for bacula-docs failed"
-#		emake -j1 || die "emake for bacula-docs failed"
-#		popd
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# install bat when enabled (for some reason ./configure doesn't pick this up)
-	if use qt4; then
-		dosbin "${S}"/src/qt-console/.libs/bat || die
-	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 static; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		if ! use bacula-clientonly; then
-			mv static-bacula-dir bacula-dir || die
-			mv static-bacula-sd bacula-sd || die
-		fi
-		if use qt4; then
-			mv static-bat bat || die
-		fi
-		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/* || die
-		fperms 0640 /usr/libexec/bacula/updatedb/README || die
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula || die
-
-		# 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 || die "Failed to install logwatch scripts"
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# remove unwanted files
-	if use bacula-clientonly; then
-		rm -vf "${D}"/etc/bacula/bconsole.conf
-		rm -vf "${D}"/usr/sbin/bconsole
-		rm -vf "${D}"/usr/libexec/bacula/bconsole
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-	if use bacula-clientonly || ! 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
-	ecompress "${D}"/usr/share/doc/${PF}/*
-#	if use doc; then
-#		for i in catalog concepts console developers install problems utility; do
-#			dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manuals/en/${i}/${i}.pdf || die
-#		done
-#	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}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-		# set database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 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}" || die
-		newconfd "${T}/${script}".confd "${script}" || die
-	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
-		echo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		ewarn "Please read the manual chapter for how to upgrade your database."
-		ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
-		ewarn "is INSECURE. The script needs to be called with the database access password"
-		ewarn "as a command line parameter, thus, the password can be seen from any other"
-		ewarn "user on the system (if not using some non-default hardened/patched kernel"
-		ewarn "with /proc restrictions)!"
-		ewarn
-		ewarn "Our advice is to NOT USE the bundled script at all, but instead use something"
-		ewarn "like this in your catalog backup job definition (example using MySQL as the"
-		ewarn "catalog database):"
-		ewarn
-		ewarn "RunBeforeJob = \"mysqldump --defaults-file=/etc/bacula/my.cnf --opt -f -r /var/lib/bacula/bacula.sql bacula\""
-		ewarn "RunAfterJob  = \"rm -f /var/lib/bacula/bacula.sql\""
-		ewarn
-		ewarn "This requires you to put all database access parameters (like user, host and"
-		ewarn "password) into a dedicated file (/etc/bacula/my.cnf in this example) which"
-		ewarn "can (and should!) be secured by simple filesystem access permissions."
-		ewarn
-		ewarn "See also:"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
-		ewarn
-		ewarn "NOTICE:"
-		ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
-		ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
-		ewarn "subject to this issue as it parses the director daemon config to extract"
-		ewarn "the configured database connection parameters (including the password)."
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 10
-		epause 20
-		echo
-
-		ewarn
-		ewarn "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
-		ewarn "and gnome (gnome-console) support have been dropped from this release."
-		ewarn
-		ebeep 3
-		epause 5
-		echo
-	fi
-
-	ewarn
-	ewarn "*** NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! ***"
-	ewarn
-	ewarn "Support for the bacula all-in-one init script has been removed from"
-	ewarn "a prior release -- if you were previously using the all-in-one init"
-	ewarn "script, please switch to using the individual init scripts now:"
-	ewarn
-	ewarn "- bacula-dir: bacula director       (for the central bacula server)"
-	ewarn "- bacula-fd:  bacula file daemon    (for hosts to be backed up)"
-	ewarn "- bacula-sd:  bacula storage daemon (for hosts storing the backup data)"
-	ewarn
-	ewarn "*** NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! ***"
-	ewarn
-	ebeep 5
-	epause 10
-}
diff --git a/app-backup/bacula/bacula-5.0.2-r1.ebuild b/app-backup/bacula/bacula-5.0.2-r1.ebuild
index 6ce5c19b4b45..28721a3d276e 100644
--- a/app-backup/bacula/bacula-5.0.2-r1.ebuild
+++ b/app-backup/bacula/bacula-5.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r1.ebuild,v 1.8 2011/03/06 09:15:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r1.ebuild,v 1.9 2011/05/14 09:28:46 tomjbe Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -354,8 +354,8 @@ src_install() {
 	for script in ${myscripts}; do
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
-		cp "${FILESDIR}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		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"
 		# set database dependancy for the director init script
 		case "${script}" in
 			bacula-dir)
diff --git a/app-backup/bacula/bacula-5.0.2-r2.ebuild b/app-backup/bacula/bacula-5.0.2-r2.ebuild
deleted file mode 100644
index b6511c7b4846..000000000000
--- a/app-backup/bacula/bacula-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.5 2011/03/06 09:15:29 jlec Exp $
-
-EAPI="2"
-inherit eutils multilib
-
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 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-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sys-libs/ncurses
-	python? ( dev-lang/python[threads] )"
-#	doc? (
-#		app-text/ghostscript-gpl
-#		dev-tex/latex2html[png]
-#		app-text/dvipdfm
-#	)
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	local -i dbnum=0
-	if ! use bacula-clientonly; then
-		if use mysql; then
-			export mydbtype=mysql
-			let dbnum++
-		fi
-		if use postgres; then
-			export mydbtype=postgresql
-			let dbnum++
-		fi
-		if use sqlite3; then
-			export mydbtype=sqlite3
-			let dbnum++
-		fi
-		if [[ "${dbnum}" -lt 1 ]]; then
-			ewarn
-			ewarn "No database backend selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		elif [[ "${dbnum}" -gt 1 ]]; then
-			ewarn
-			ewarn "Too many database backends selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		fi
-	fi
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula || die
-		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 || die
-			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 #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 #32701
-	epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable static static-tools) \
-			$(use_enable static static-fd) \
-			$(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"
-		if ! use bacula-nodir; then
-			myconf="${myconf} $(use_enable static static-dir)"
-		fi
-		if ! use bacula-nosd; then
-			myconf="${myconf} $(use_enable static static-sd)"
-		fi
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_enable qt4 bat) \
-		$(use_enable static static-cons)
-		$(use_with python) \
-		$(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 \
-		--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 \
-		--host=${CHOST} \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# build docs from bacula-docs tarball
-#	if use doc; then
-#		pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
-#		./configure \
-#			--with-bacula="${S}" \
-#			|| die "configure for bacula-docs failed"
-#		emake -j1 || die "emake for bacula-docs failed"
-#		popd
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
-
-	# install bat when enabled (for some reason ./configure doesn't pick this up)
-	if use qt4; then
-		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
-		insinto /usr/share/applications
-		doins scripts/bat.desktop || die
-	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 static; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		if ! use bacula-clientonly; then
-			mv static-bacula-dir bacula-dir || die
-			mv static-bacula-sd bacula-sd || die
-		fi
-		if use qt4; then
-			mv static-bat bat || die
-		fi
-		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/* || die
-		fperms 0640 /usr/libexec/bacula/updatedb/README || die
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula || die
-
-		# 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 || die "Failed to install logwatch scripts"
-			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
-	ecompress "${D}"/usr/share/doc/${PF}/*
-#	if use doc; then
-#		for i in catalog concepts console developers install problems utility; do
-#			dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manuals/en/${i}/${i}.pdf || die
-#		done
-#	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim || die
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim || die
-	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}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-		# set database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 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}" || die
-		newconfd "${T}/${script}".confd "${script}" || die
-	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
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		ewarn "Please read the manual chapter for how to upgrade your database."
-		ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
-		ewarn "is INSECURE. The script needs to be called with the database access password"
-		ewarn "as a command line parameter, thus, the password can be seen from any other"
-		ewarn "user on the system"
-		ewarn
-		ewarn "NOTICE:"
-		ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
-		ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
-		ewarn "subject to this issue as it parses the director daemon config to extract"
-		ewarn "the configured database connection parameters (including the password)."
-		ewarn
-		ewarn "See also:"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		einfo
-		einfo "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
-		einfo "and gnome (gnome-console) support have been dropped."
-		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-5.0.3-r1.ebuild b/app-backup/bacula/bacula-5.0.3-r1.ebuild
index 3924cc542886..2f825d33b97f 100644
--- a/app-backup/bacula/bacula-5.0.3-r1.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.8 2011/03/06 09:15:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.9 2011/05/14 09:28:46 tomjbe Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -339,8 +339,8 @@ src_install() {
 	for script in ${myscripts}; do
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
-		cp "${FILESDIR}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		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"
 		# set database dependancy for the director init script
 		case "${script}" in
 			bacula-dir)
diff --git a/app-backup/bacula/bacula-5.0.3-r2.ebuild b/app-backup/bacula/bacula-5.0.3-r2.ebuild
index d3fde10fc7eb..f0ec7d380df4 100644
--- a/app-backup/bacula/bacula-5.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.5 2011/03/06 09:15:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.6 2011/05/14 09:28:46 tomjbe Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -346,8 +346,8 @@ src_install() {
 	for script in ${myscripts}; do
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
-		cp "${FILESDIR}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		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"
 		# set database dependancy for the director init script
 		case "${script}" in
 			bacula-dir)
diff --git a/app-backup/bacula/bacula-5.0.3-r3.ebuild b/app-backup/bacula/bacula-5.0.3-r3.ebuild
index 9e1828b01ab3..167f15908b6a 100644
--- a/app-backup/bacula/bacula-5.0.3-r3.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.2 2011/03/06 09:15:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.3 2011/05/14 09:28:46 tomjbe Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -343,8 +343,8 @@ src_install() {
 	for script in ${myscripts}; do
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
-		cp "${FILESDIR}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		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"
 		# set database dependancy for the director init script
 		case "${script}" in
 			bacula-dir)
diff --git a/app-backup/bacula/bacula-5.0.3.ebuild b/app-backup/bacula/bacula-5.0.3.ebuild
deleted file mode 100644
index c6a2171cdab3..000000000000
--- a/app-backup/bacula/bacula-5.0.3.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3.ebuild,v 1.2 2011/03/06 09:15:29 jlec Exp $
-
-EAPI="2"
-inherit eutils multilib
-
-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 ~hppa ~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 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-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sys-libs/ncurses
-	python? ( dev-lang/python[threads] )"
-#	doc? (
-#		app-text/ghostscript-gpl
-#		dev-tex/latex2html[png]
-#		app-text/dvipdfm
-#	)
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	local -i dbnum=0
-	if ! use bacula-clientonly; then
-		if use mysql; then
-			export mydbtype=mysql
-			let dbnum++
-		fi
-		if use postgres; then
-			export mydbtype=postgresql
-			let dbnum++
-		fi
-		if use sqlite3; then
-			export mydbtype=sqlite3
-			let dbnum++
-		fi
-		if [[ "${dbnum}" -lt 1 ]]; then
-			ewarn
-			ewarn "No database backend selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		elif [[ "${dbnum}" -gt 1 ]]; then
-			ewarn
-			ewarn "Too many database backends selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		fi
-	fi
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula || die
-		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 || die
-			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 #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
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable static static-tools) \
-			$(use_enable static static-fd) \
-			$(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"
-		if ! use bacula-nodir; then
-			myconf="${myconf} $(use_enable static static-dir)"
-		fi
-		if ! use bacula-nosd; then
-			myconf="${myconf} $(use_enable static static-sd)"
-		fi
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_enable qt4 bat) \
-		$(use_enable static static-cons)
-		$(use_with python) \
-		$(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 \
-		--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 \
-		--host=${CHOST} \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# build docs from bacula-docs tarball
-#	if use doc; then
-#		pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
-#		./configure \
-#			--with-bacula="${S}" \
-#			|| die "configure for bacula-docs failed"
-#		emake -j1 || die "emake for bacula-docs failed"
-#		popd
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
-
-	# install bat when enabled (for some reason ./configure doesn't pick this up)
-	if use qt4; then
-		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
-		insinto /usr/share/applications
-		doins scripts/bat.desktop || die
-	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 static; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		if ! use bacula-clientonly; then
-			mv static-bacula-dir bacula-dir || die
-			mv static-bacula-sd bacula-sd || die
-		fi
-		if use qt4; then
-			mv static-bat bat || die
-		fi
-		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/* || die
-		fperms 0640 /usr/libexec/bacula/updatedb/README || die
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula || die
-
-		# 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 || die "Failed to install logwatch scripts"
-			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
-	ecompress "${D}"/usr/share/doc/${PF}/*
-#	if use doc; then
-#		for i in catalog concepts console developers install problems utility; do
-#			dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manuals/en/${i}/${i}.pdf || die
-#		done
-#	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim || die
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim || die
-	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}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-		# set database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 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}" || die
-		newconfd "${T}/${script}".confd "${script}" || die
-	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
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		ewarn "Please read the manual chapter for how to upgrade your database."
-		ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
-		ewarn "is INSECURE. The script needs to be called with the database access password"
-		ewarn "as a command line parameter, thus, the password can be seen from any other"
-		ewarn "user on the system"
-		ewarn
-		ewarn "NOTICE:"
-		ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
-		ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
-		ewarn "subject to this issue as it parses the director daemon config to extract"
-		ewarn "the configured database connection parameters (including the password)."
-		ewarn
-		ewarn "See also:"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		einfo
-		einfo "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
-		einfo "and gnome (gnome-console) support have been dropped."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
diff --git a/app-backup/bacula/files/5.0.1/bacula-5.0.1-as-needed.patch b/app-backup/bacula/files/5.0.1/bacula-5.0.1-as-needed.patch
deleted file mode 100644
index 7ad36130618a..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-5.0.1-as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN bacula-5.0.1.orig/src/findlib/Makefile.in bacula-5.0.1/src/findlib/Makefile.in
---- bacula-5.0.1.orig/src/findlib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.0.1/src/findlib/Makefile.in	2010-03-22 17:37:43.772805754 +0100
-@@ -59,7 +59,7 @@
- 
- libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
-diff -urN bacula-5.0.1.orig/src/lib/Makefile.in bacula-5.0.1/src/lib/Makefile.in
---- bacula-5.0.1.orig/src/lib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.0.1/src/lib/Makefile.in	2010-03-22 17:37:05.352226188 +0100
-@@ -126,7 +126,7 @@
- 
- libbac.la: Makefile $(LIBBAC_LOBJS)
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) $(LIBS) $(OPENSSL_LIBS)
- 
- libbaccfg.a: $(LIBBACCFG_OBJS) 
- 	@echo "Making $@ ..."
-@@ -135,7 +135,7 @@
- 
- libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) $(LIBS) $(OPENSSL_LIBS)
- 
- libbacpy.a: $(LIBBACPY_OBJS) 
- 	@echo "Making $@ ..."
diff --git a/app-backup/bacula/files/5.0.1/bacula-5.0.1-lib-search-path.patch b/app-backup/bacula/files/5.0.1/bacula-5.0.1-lib-search-path.patch
deleted file mode 100644
index c3bded40ad03..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-5.0.1-lib-search-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of lib search path.
---- src/console/Makefile.in.orig	2010-03-29 11:35:00.000000000 +0000
-+++ src/console/Makefile.in	2010-03-29 11:45:14.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
diff --git a/app-backup/bacula/files/5.0.1/bacula-5.0.1-ncurses.patch b/app-backup/bacula/files/5.0.1/bacula-5.0.1-ncurses.patch
deleted file mode 100644
index 6608e0eef671..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-5.0.1-ncurses.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN bacula-5.0.1.orig/autoconf/configure.in bacula-5.0.1/autoconf/configure.in
---- bacula-5.0.1.orig/autoconf/configure.in	2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.0.1/autoconf/configure.in	2010-03-22 16:51:57.282119344 +0100
-@@ -823,7 +823,7 @@
- if test x$support_conio = xyes; then
-    AC_CHECK_HEADER(termcap.h, 
-      [ AC_CHECK_LIB(termcap, tgetent, 
--       [ CONS_LIBS="-ltermcap"
-+       [ CONS_LIBS="-lncurses"
-     CONS_OBJ="conio.o"
-     CONS_SRC="conio.c"
-     got_conio="yes"
-@@ -899,7 +899,7 @@
- 	     AC_CHECK_HEADER(${with_readline}/readline.h, 
- 		[
- 		    AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
--		    CONS_LIBS="-lreadline -lhistory -ltermcap"
-+		    CONS_LIBS="-lreadline -lhistory -lncurses"
- 		    got_readline="yes"	 
- 		], [
- 		    echo " "
-@@ -916,7 +916,7 @@
- 		AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
- 		got_readline="yes"
- 		CONS_INC="-I/usr/include/readline"
--		CONS_LIBS="-lreadline -ltermcap"
-+		CONS_LIBS="-lreadline -lncurses"
- 	    ], [
- 		dnl Did not find standard library, so try Bacula's default
- 		AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
-@@ -924,7 +924,7 @@
- 			AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
- 			got_readline="yes"   
- 			CONS_INC="-I${TOP_DIR}/depkgs/readline"
--			CONS_LIBS="-lreadline -lhistory -ltermcap"
-+			CONS_LIBS="-lreadline -lhistory -lncurses"
- 			CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
- 			PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
- 		    ], [
diff --git a/app-backup/bacula/files/5.0.1/bacula-dir.confd b/app-backup/bacula/files/5.0.1/bacula-dir.confd
deleted file mode 100644
index 63f6994a4a13..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-dir.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.1/bacula-dir.confd,v 1.1 2010/03/23 10:12:36 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-dir
-
-# If the database server where you store your bacula catalog
-# is on a different machine, please set this to 0.
-# Setting it to 1 makes bacula-dir depend on the corresponding
-# database service selected at package compile time.
-LOCAL_DB=1
-
-# Options for the director daemon.
-# The director can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/5.0.1/bacula-dir.initd b/app-backup/bacula/files/5.0.1/bacula-dir.initd
deleted file mode 100644
index 1b4a8ef62184..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-dir.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.1/bacula-dir.initd,v 1.1 2010/03/23 10:12:36 wschlich Exp $
-
-depend() {
-	need net
-	if [ "${LOCAL_DB}" -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns bacula-fd bacula-sd
-}
-
-start() {
-	ebegin "Starting bacula director"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-		-- ${DIR_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula director"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-	eend $?
-}
diff --git a/app-backup/bacula/files/5.0.1/bacula-fd.confd b/app-backup/bacula/files/5.0.1/bacula-fd.confd
deleted file mode 100644
index 3dd3029f1a38..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-fd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.1/bacula-fd.confd,v 1.1 2010/03/23 10:12:36 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-fd
-
-# Options for the file daemon.
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/5.0.1/bacula-fd.initd b/app-backup/bacula/files/5.0.1/bacula-fd.initd
deleted file mode 100644
index 782b9671aa65..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-fd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.1/bacula-fd.initd,v 1.1 2010/03/23 10:12:36 wschlich Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting bacula file daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-		-- ${FD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula file daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-	eend $?
-}
diff --git a/app-backup/bacula/files/5.0.1/bacula-sd.confd b/app-backup/bacula/files/5.0.1/bacula-sd.confd
deleted file mode 100644
index be92092a92fd..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-sd.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.1/bacula-sd.confd,v 1.1 2010/03/23 10:12:36 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-sd
-
-# Options for the storage daemon.
-# The storage daemon can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/5.0.1/bacula-sd.initd b/app-backup/bacula/files/5.0.1/bacula-sd.initd
deleted file mode 100644
index 6ad5b4142a23..000000000000
--- a/app-backup/bacula/files/5.0.1/bacula-sd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.1/bacula-sd.initd,v 1.1 2010/03/23 10:12:36 wschlich Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting bacula storage daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-		-- ${SD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-	eend $?
-}
diff --git a/app-backup/bacula/files/5.0.2/bacula-dir.confd b/app-backup/bacula/files/5.0.2/bacula-dir.confd
deleted file mode 100644
index 9fed05975e62..000000000000
--- a/app-backup/bacula/files/5.0.2/bacula-dir.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.2/bacula-dir.confd,v 1.1 2010/05/11 06:50:19 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-dir
-
-# If the database server where you store your bacula catalog
-# is on a different machine, please set this to 0.
-# Setting it to 1 makes bacula-dir depend on the corresponding
-# database service selected at package compile time.
-LOCAL_DB=1
-
-# Options for the director daemon.
-# The director can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/5.0.2/bacula-dir.initd b/app-backup/bacula/files/5.0.2/bacula-dir.initd
deleted file mode 100644
index cefe0072a582..000000000000
--- a/app-backup/bacula/files/5.0.2/bacula-dir.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.2/bacula-dir.initd,v 1.1 2010/05/11 06:50:19 wschlich Exp $
-
-depend() {
-	need net
-	if [ "${LOCAL_DB}" -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns bacula-fd bacula-sd
-}
-
-start() {
-	ebegin "Starting bacula director"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-		-- ${DIR_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula director"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-	eend $?
-}
diff --git a/app-backup/bacula/files/5.0.2/bacula-fd.confd b/app-backup/bacula/files/5.0.2/bacula-fd.confd
deleted file mode 100644
index 65b81cd43e74..000000000000
--- a/app-backup/bacula/files/5.0.2/bacula-fd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.2/bacula-fd.confd,v 1.1 2010/05/11 06:50:19 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-fd
-
-# Options for the file daemon.
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/5.0.2/bacula-fd.initd b/app-backup/bacula/files/5.0.2/bacula-fd.initd
deleted file mode 100644
index 7c1ccaaa7269..000000000000
--- a/app-backup/bacula/files/5.0.2/bacula-fd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.2/bacula-fd.initd,v 1.1 2010/05/11 06:50:19 wschlich Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting bacula file daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-		-- ${FD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula file daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-	eend $?
-}
diff --git a/app-backup/bacula/files/5.0.2/bacula-sd.confd b/app-backup/bacula/files/5.0.2/bacula-sd.confd
deleted file mode 100644
index 39c96b715453..000000000000
--- a/app-backup/bacula/files/5.0.2/bacula-sd.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.2/bacula-sd.confd,v 1.1 2010/05/11 06:50:19 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-sd
-
-# Options for the storage daemon.
-# The storage daemon can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/5.0.2/bacula-sd.initd b/app-backup/bacula/files/5.0.2/bacula-sd.initd
deleted file mode 100644
index dc95e0122a3d..000000000000
--- a/app-backup/bacula/files/5.0.2/bacula-sd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.2/bacula-sd.initd,v 1.1 2010/05/11 06:50:19 wschlich Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting bacula storage daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-		-- ${SD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-	eend $?
-}
diff --git a/app-backup/bacula/files/5.0.3/bacula-dir.confd b/app-backup/bacula/files/bacula-dir.confd
index 81360c98f046..e1f8ec16c65b 100644
--- a/app-backup/bacula/files/5.0.3/bacula-dir.confd
+++ b/app-backup/bacula/files/bacula-dir.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.confd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-dir.confd,v 1.1 2011/05/14 09:28:46 tomjbe Exp $
 
 # Config file for /etc/init.d/bacula-dir
 
diff --git a/app-backup/bacula/files/5.0.3/bacula-dir.initd b/app-backup/bacula/files/bacula-dir.initd
index b0db60d7a5fc..4f43013bd45f 100644
--- a/app-backup/bacula/files/5.0.3/bacula-dir.initd
+++ b/app-backup/bacula/files/bacula-dir.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.initd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-dir.initd,v 1.1 2011/05/14 09:28:46 tomjbe Exp $
 
 depend() {
 	need net
diff --git a/app-backup/bacula/files/5.0.3/bacula-fd.confd b/app-backup/bacula/files/bacula-fd.confd
index 198f544bcfdd..ebd450132932 100644
--- a/app-backup/bacula/files/5.0.3/bacula-fd.confd
+++ b/app-backup/bacula/files/bacula-fd.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.confd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-fd.confd,v 1.1 2011/05/14 09:28:46 tomjbe Exp $
 
 # Config file for /etc/init.d/bacula-fd
 
diff --git a/app-backup/bacula/files/5.0.3/bacula-fd.initd b/app-backup/bacula/files/bacula-fd.initd
index 0d1373c820d4..97e9c0d3dde8 100644
--- a/app-backup/bacula/files/5.0.3/bacula-fd.initd
+++ b/app-backup/bacula/files/bacula-fd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.initd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-fd.initd,v 1.1 2011/05/14 09:28:46 tomjbe Exp $
 
 depend() {
 	need net
diff --git a/app-backup/bacula/files/5.0.3/bacula-sd.confd b/app-backup/bacula/files/bacula-sd.confd
index c1ef459cc475..297174c69131 100644
--- a/app-backup/bacula/files/5.0.3/bacula-sd.confd
+++ b/app-backup/bacula/files/bacula-sd.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.confd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-sd.confd,v 1.1 2011/05/14 09:28:46 tomjbe Exp $
 
 # Config file for /etc/init.d/bacula-sd
 
diff --git a/app-backup/bacula/files/5.0.3/bacula-sd.initd b/app-backup/bacula/files/bacula-sd.initd
index 8305b5be8692..96d9407fee47 100644
--- a/app-backup/bacula/files/5.0.3/bacula-sd.initd
+++ b/app-backup/bacula/files/bacula-sd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.initd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-sd.initd,v 1.1 2011/05/14 09:28:46 tomjbe Exp $
 
 depend() {
 	need net