clean out old versions with keywords overshadowed by newer ebuilds

(Portage version: 2.1.2.2)

27 files changed, 15 insertions, 1931 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 4db9eb65a124..9c09063795f5 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-backup/bacula
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.29 2007/03/25 19:22:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.30 2007/03/27 15:27:44 mr_bones_ Exp $
+
+  27 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/bacula-1.38.5-default-configs.patch,
+  -files/bacula-1.38.9-default-configs.patch, -files/1.38.5/bacula-all-conf,
+  -files/1.38.5/bacula-all-init, -files/1.38.5/bacula-dir-conf,
+  -files/1.38.5/bacula-dir-init, -files/1.38.5/bacula-fd-conf,
+  -files/1.38.5/bacula-fd-init, -files/1.38.5/bacula-sd-conf,
+  -files/1.38.5/bacula-sd-init, -files/2.0.2/bacula-all-conf,
+  -files/2.0.2/bacula-all-init, -files/2.0.2/bacula-dir-conf,
+  -files/2.0.2/bacula-dir-init, -files/2.0.2/bacula-fd-conf,
+  -files/2.0.2/bacula-fd-init, -files/2.0.2/bacula-sd-conf,
+  -files/2.0.2/bacula-sd-init, -bacula-1.36.3-r3.ebuild,
+  -bacula-1.38.5.ebuild, -bacula-1.38.9.ebuild, -bacula-2.0.2.ebuild:
+  clean out old versions with keywords overshadowed by newer ebuilds per lisa
 
   25 Mar 2007; <genstef@gentoo.org> ChangeLog:
   Remove virtual/x11 depend
diff --git a/app-backup/bacula/bacula-1.36.3-r3.ebuild b/app-backup/bacula/bacula-1.36.3-r3.ebuild
deleted file mode 100644
index a6937df4f6dd..000000000000
--- a/app-backup/bacula/bacula-1.36.3-r3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.36.3-r3.ebuild,v 1.6 2007/03/07 11:57:31 genstef Exp $
-
-inherit eutils
-
-IUSE="bacula-clientonly bacula-console bacula-split-init doc gnome logrotate logwatch mysql postgres readline sqlite static tcpd wxwindows X"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-DOC_VER="1.36.3"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz
-		doc? ( mirror://sourceforge/bacula/${PN}-doc-${DOC_VER}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		mysql? ( virtual/mysql )
-		!mysql? (
-			postgres? ( >=dev-db/postgresql-7.4.0 )
-			!postgres? (
-				sqlite? ( =dev-db/sqlite-2* )
-				!sqlite? ( virtual/mysql )
-			)
-		)
-		virtual/mta
-	)
-	bacula-console? (
-		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-		gnome? (
-			>=gnome-base/gnome-2
-			>=gnome-base/libgnome-2
-			x11-libs/gksu
-		)
-	)
-	logrotate? ( app-admin/logrotate )
-	!hppa? (
-		logwatch? ( sys-apps/logwatch )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		sys-block/mtx
-		app-arch/mt-st
-	)"
-
-pkg_setup() {
-	export mydb=""
-	if ! use bacula-clientonly ; then
-		if use mysql ; then
-			mydb="mysql"
-		elif use postgres ; then
-			mydb="postgresql"
-		elif use sqlite ; then
-			mydb="sqlite"
-		else
-			mydb="mysql"
-		fi
-		export mydb="${mydb}"
-	fi
-
-	# create the daemon group and user
-	HAVE_BACULA_GROUP="`cat /etc/group | grep bacula\: 2>/dev/null`"
-	if [ -z "${HAVE_BACULA_GROUP}" ]; then
-		enewgroup bacula
-		eerror "The group bacula has been created. Any users you add to this"
-		eerror "group have access to files created by the daemons."
-		eerror ""
-	fi
-	if ! use bacula-clientonly ; then
-		HAVE_BACULA_USER="`id -u bacula 2>/dev/null`"
-		if [ -z "${HAVE_BACULA_USER}" ] ; then
-			enewuser "bacula" -1 -1 "/var/lib/bacula" "bacula,disk,tape,cdrom,cdrw"
-			eerror "The user bacula has been created.  Please see the bacula manual"
-			eerror "for information about running bacula as a non-root user."
-			eerror ""
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# this resolves bacula bug #181
-	epatch ${FILESDIR}/${P}-cdrecord-configure.patch
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	epatch ${FILESDIR}/${P}-default-configs.patch
-	# secures temp file for mtx output
-	epatch ${FILESDIR}/${P}-mtxtmpfile.patch
-	# resolves security issue with random password generation
-	cp ${FILESDIR}/randpass-1.37.40 ${S}/autoconf/randpass
-	# removes tags for non-existant images from html docs
-	if use doc ; then
-		cd ${WORKDIR}/${PN}-doc-${DOC_VER}
-		epatch ${FILESDIR}/${PN}-doc-${DOC_VER}-latex-icons.patch
-		cd ${S}
-	fi
-
-	patch -p0 -f < "${FILESDIR}"/bacula-2.0.2-gnomesu2gksu.diff
-
-	# autoconf
-	cd ${S}/autoconf
-	autoconf ${S}/autoconf/configure.in > ${S}/configure
-	cd ${S}
-	chmod 0750 ${S}/configure
-}
-
-src_compile() {
-	local myconf=""
-	if use bacula-clientonly ; then
-		myconf="${myconf} \
-			`use_enable bacula-clientonly client-only` \
-			`use_enable static static-fd`"
-	fi
-	if use bacula-console ; then
-		myconf="${myconf} \
-			`use_with X x` \
-			`use_enable gnome` \
-			`use_enable gnome tray-monitor` \
-			`use_enable wxwindows wx-console` \
-			`use_enable static static-cons`"
-	fi
-	myconf="${myconf} \
-		`use_with readline` \
-		`use_with tcpd tcp-wrappers`"
-
-	if ! use bacula-clientonly; then
-		# select database support
-		if [ ${mydb} == "postgresql" ]; then
-			myconf="${myconf} \
-				`use_with postgres postgresql`"
-		else
-			myconf="${myconf} \
-				`use_with ${mydb}`"
-		fi
-		myconf="${myconf} \
-			`use_enable static static-tools` \
-			`use_enable static static-fd` \
-			`use_enable static static-sd` \
-			`use_enable static static-dir`"
-	fi
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--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 "Configure failed!"
-
-	emake || die "Failed primary build!"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "Failed install to ${D} !"
-
-	if use static ; then
-		cd ${D}/usr/sbin
-		mv static-bacula-fd bacula-fd
-		mv static-bconsole bconsole
-		if ! use bacula-clientonly ; then
-			mv static-bacula-dir bacula-dir
-			mv static-bacula-sd bacula-sd
-		fi
-		if use gnome ; then
-			mv static-gnome-console gnome-console
-		fi
-		cd ${S}
-	fi
-
-	if use bacula-console ; then
-		if use gnome ; then
-			emake DESTDIR=${D} \
-				install-menu \
-				install-menu-xsu || die "Failed to install gnome menu files to ${D}" \
-			make_desktop_entry \
-				"gnome-console -c /etc/bacula/gnome-console.conf" \
-				"Bacula Console" /usr/share/pixmaps/bacula.png "app-admin" \
-				"/usr/sbin"
-		fi
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly ; then
-	    # the database update scripts
-		diropts -m0750
-		dodir /usr/libexec/bacula/updatedb
-		insinto /usr/libexec/bacula/updatedb/
-		insopts -m0754
-		doins ${S}/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		if use logrotate ; then
-			diropts -m0755
-			dodir /etc/logrotate.d
-			insinto /etc/logrotate.d
-			insopts -m0644
-			newins ${S}/scripts/logrotate bacula
-		fi
-
-		# the logwatch scripts
-		if use logwatch ; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			cd ${S}/scripts/logwatch
-			emake DESTDIR=${D} install || die "Failed to install logwatch scripts to ${D} !"
-			cd ${S}
-		fi
-	fi
-
-	# documentation
-	for my_doc in ${S}/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
-	do
-		dodoc ${my_doc}
-	done
-	if use doc ; then
-		dodoc ${WORKDIR}/${PN}-doc-${DOC_VER}/{bacula.pdf,developers.pdf}
-		diropts -m0755
-		dodir /usr/share/doc/${PF}/html-manual
-		dodir /usr/share/doc/${PF}/web-manual
-		insopts -m0644
-		insinto /usr/share/doc/${PF}/html-manual
-		doins ${WORKDIR}/${PN}-doc-${DOC_VER}/html-manual/*
-		insinto /usr/share/doc/${PF}/web-manual
-		doins ${WORKDIR}/${PN}-doc-${DOC_VER}/web-manual/*
-	fi
-
-	# clean up permissions left broken by install
-	fperms 0644 ${D}/usr/libexec/bacula/query.sql
-
-	# setup init scripts
-	if ! use bacula-clientonly ; then
-		my_services="bacula-fd bacula-sd bacula-dir"
-	else
-		my_services="bacula-fd"
-	fi
-	exeinto /etc/init.d/
-	insinto /etc/conf.d/
-	if use bacula-split-init ; then
-		my_scripts=""
-		for service in ${my_services} ; do
-			my_scripts="${my_scripts} ${service}"
-		done
-	else
-		my_scripts="bacula-all"
-	fi
-	for script in ${my_scripts}; do
-		cp ${FILESDIR}/${PV}/${script}-conf ${T}/${script}.conf
-		cp ${FILESDIR}/${PV}/${script}-init ${T}/${script}.init
-		if [ "${mydb}" == "sqlite" ]; then
-			sed -i -e "s:%database%::" ${T}/${script}.init
-		else
-			sed -i -e "s:%database%:${mydb}:" ${T}/${script}.init
-		fi
-		sed -i -e "s:%services%:${my_services}:" ${T}/${script}.conf
-		newexe ${T}/${script}.init ${script}
-		newins ${T}/${script}.conf ${script}
-	done
-}
-
-pkg_postinst() {
-	diropts -m0750
-	dodir /var/lib/bacula
-	if use bacula-clientonly ; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly ; then
-		elog "If this is a new install, you must create the ${mydb} databases with:"
-		elog " /usr/libexec/bacula/create_${mydb}_database"
-		elog " /usr/libexec/bacula/make_${mydb}_tables"
-		elog " /usr/libexec/bacula/grant_${mydb}_privileges"
-		elog ""
-		elog "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		elog "Please read the manual chapter for how to upgrade your database."
-		elog "You can find database upgrade scripts in /usr/libexec/bacula/updatedb."
-		elog ""
-	fi
-}
diff --git a/app-backup/bacula/bacula-1.38.5.ebuild b/app-backup/bacula/bacula-1.38.5.ebuild
deleted file mode 100644
index 97fccfafabe4..000000000000
--- a/app-backup/bacula/bacula-1.38.5.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.38.5.ebuild,v 1.7 2007/03/07 11:57:31 genstef Exp $
-
-inherit eutils
-
-IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd bacula-split-init doc gnome logrotate logwatch mysql postgres python readline sqlite ssl static tcpd wxwindows X"
-KEYWORDS="~sparc ~x86"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-DOC_VER="1.38.5"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz
-		doc? ( mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		mysql? ( virtual/mysql )
-		!mysql? (
-			postgres? ( >=dev-db/postgresql-7.4.0 )
-			!postgres? (
-				sqlite? ( =dev-db/sqlite-2* )
-				!sqlite? ( virtual/mysql )
-			)
-		)
-		virtual/mta
-	)
-	bacula-console? (
-		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-		gnome? (
-			>=gnome-base/gnome-2
-			>=gnome-base/libgnome-2
-			x11-libs/gksu
-		)
-	)
-	ssl? ( dev-libs/openssl )
-	logrotate? ( app-admin/logrotate )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		sys-block/mtx
-		app-arch/mt-st
-	)"
-
-pkg_setup() {
-	export mydb=""
-	if ! use bacula-clientonly ; then
-		if use mysql ; then
-			mydb="mysql"
-		elif use postgres ; then
-			mydb="postgresql"
-		elif use sqlite ; then
-			mydb="sqlite"
-		else
-			mydb="mysql"
-		fi
-		export mydb="${mydb}"
-	fi
-
-	# create the daemon group and user
-	HAVE_BACULA_GROUP="`cat /etc/group | grep bacula\: 2>/dev/null`"
-	if [ -z "${HAVE_BACULA_GROUP}" ]; then
-		enewgroup bacula
-		elog "The group bacula has been created. Any users you add to this"
-		elog "group have access to files created by the daemons."
-		elog
-	fi
-	if ! use bacula-clientonly ; then
-		HAVE_BACULA_USER="`id -u bacula 2>/dev/null`"
-		if [ -z "${HAVE_BACULA_USER}" ] ; then
-			enewuser "bacula" -1 -1 "/var/lib/bacula" "bacula,disk,tape,cdrom,cdrw"
-			elog "The user bacula has been created.  Please see the bacula manual"
-			elog "for information about running bacula as a non-root user."
-			elog
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	epatch ${FILESDIR}/${P}-default-configs.patch
-	patch -p0 -f < "${FILESDIR}"/bacula-2.0.2-gnomesu2gksu.diff
-}
-
-src_compile() {
-	local myconf=""
-	if use bacula-clientonly ; then
-		myconf="${myconf} \
-			`use_enable bacula-clientonly client-only` \
-			`use_enable static static-fd`"
-	fi
-	if use bacula-console ; then
-		myconf="${myconf} \
-			`use_with X x` \
-			`use_enable gnome` \
-			`use_enable gnome tray-monitor` \
-			`use_enable wxwindows wx-console` \
-			`use_enable static static-cons`"
-	fi
-	myconf="${myconf} \
-		`use_with python` \
-		`use_with readline` \
-		`use_with ssl openssl` \
-		`use_with tcpd tcp-wrappers`"
-
-	if ! use bacula-clientonly; then
-		# select database support
-		if [ ${mydb} == "postgresql" ]; then
-			myconf="${myconf} `use_with postgres postgresql`"
-		else
-			myconf="${myconf} `use_with ${mydb}`"
-		fi
-		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} `use_enable static static-dir`"
-		fi
-		if ! use bacula-nosd ; then
-			myconf="${myconf} `use_enable static static-sd`"
-		fi
-
-	fi
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--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 "Configure failed!"
-
-	emake || die "Failed primary build!"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "Failed install to ${D} !"
-
-	if use static ; then
-		cd ${D}/usr/sbin
-		mv static-bacula-fd bacula-fd
-		mv static-bconsole bconsole
-		if ! use bacula-clientonly ; then
-			mv static-bacula-dir bacula-dir
-			mv static-bacula-sd bacula-sd
-		fi
-		if use gnome ; then
-			mv static-gnome-console gnome-console
-		fi
-		cd ${S}
-	fi
-
-	if use bacula-console ; then
-		if use gnome ; then
-			emake DESTDIR=${D} \
-				install-menu \
-				install-menu-xsu || die "Failed to install gnome menu files to ${D}" \
-			make_desktop_entry \
-				"gnome-console -c /etc/bacula/gnome-console.conf" \
-				"Bacula Console" /usr/share/pixmaps/bacula.png "app-admin" \
-				"/usr/sbin"
-		fi
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly ; then
-	    # the database update scripts
-		diropts -m0750
-		dodir /usr/libexec/bacula/updatedb
-		insinto /usr/libexec/bacula/updatedb/
-		insopts -m0754
-		doins ${S}/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		if use logrotate ; then
-			diropts -m0755
-			dodir /etc/logrotate.d
-			insinto /etc/logrotate.d
-			insopts -m0644
-			newins ${S}/scripts/logrotate bacula
-		fi
-
-		# the logwatch scripts
-		if use logwatch ; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			cd ${S}/scripts/logwatch
-			emake DESTDIR=${D} install || die "Failed to install logwatch scripts to ${D} !"
-			cd ${S}
-		fi
-	fi
-
-	# documentation
-	for my_doc in ${S}/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
-	do
-		dodoc ${my_doc}
-	done
-	if use doc ; then
-		dodoc ${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers.pdf
-		dodoc ${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula.pdf
-		diropts -m0755
-		dodir /usr/share/doc/${PF}/developers
-		dodir /usr/share/doc/${PF}/manual
-		insopts -m0644
-		insinto /usr/share/doc/${PF}/developers
-		doins ${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers/*
-		insinto /usr/share/doc/${PF}/manual
-		doins ${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula/*
-	fi
-
-	# clean up permissions left broken by install
-	fperms 0644 ${D}/usr/libexec/bacula/query.sql
-
-	# setup init scripts
-	my_services="bacula-fd"
-	if ! use bacula-clientonly ; then
-		if ! use bacula-no-dir ; then
-			my_services="${my_services} bacula-dir"
-		fi
-		if ! use bacula-no-sd ; then
-			my_services="${my_services} bacula-sd"
-		fi
-	fi
-	exeinto /etc/init.d/
-	insinto /etc/conf.d/
-	if use bacula-split-init ; then
-		my_scripts=""
-		for service in ${my_services} ; do
-			my_scripts="${my_scripts} ${service}"
-		done
-	else
-		my_scripts="bacula-all"
-	fi
-	for script in ${my_scripts}; do
-		cp ${FILESDIR}/${PV}/${script}-conf ${T}/${script}.conf
-		cp ${FILESDIR}/${PV}/${script}-init ${T}/${script}.init
-		if [ "${mydb}" == "sqlite" ]; then
-			sed -i -e "s:%database%::" ${T}/${script}.init
-		else
-			sed -i -e "s:%database%:${mydb}:" ${T}/${script}.init
-		fi
-		sed -i -e "s:%services%:${my_services}:" ${T}/${script}.conf
-		newexe ${T}/${script}.init ${script}
-		newins ${T}/${script}.conf ${script}
-	done
-}
-
-pkg_postinst() {
-	diropts -m0750
-	dodir /var/lib/bacula
-	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-no-dir ; then
-		elog "If this is a new install, you must create the ${mydb} databases with:"
-		elog " /usr/libexec/bacula/create_${mydb}_database"
-		elog " /usr/libexec/bacula/make_${mydb}_tables"
-		elog " /usr/libexec/bacula/grant_${mydb}_privileges"
-		elog ""
-		elog "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		elog "Please read the manual chapter for how to upgrade your database."
-		elog "You can find database upgrade scripts in /usr/libexec/bacula/updatedb."
-		elog ""
-	fi
-}
diff --git a/app-backup/bacula/bacula-1.38.9.ebuild b/app-backup/bacula/bacula-1.38.9.ebuild
deleted file mode 100644
index 59436d480868..000000000000
--- a/app-backup/bacula/bacula-1.38.9.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.38.9.ebuild,v 1.8 2007/03/07 11:57:31 genstef Exp $
-
-inherit eutils
-
-IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd bacula-split-init doc gnome logrotate logwatch mysql postgres python readline sqlite sqlite3 ssl static tcpd wxwindows X"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-DOC_VER="1.38.9"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz
-		doc? ( mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( >=dev-db/postgresql-7.4.0 )
-		mysql? ( virtual/mysql )
-		sqlite? ( =dev-db/sqlite-2* )
-		sqlite3? ( >=dev-db/sqlite-3.0.0 )
-		virtual/mta
-	)
-	bacula-console? (
-		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-		gnome? (
-			>=gnome-base/libgnome-2
-			x11-libs/gksu
-		)
-	)
-	ssl? ( dev-libs/openssl )
-	logrotate? ( app-admin/logrotate )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		sys-block/mtx
-		app-arch/mt-st
-	)"
-
-pkg_setup() {
-	export mydb=""
-	dbcnt=0
-	if ! use bacula-clientonly ; then
-		if use mysql ; then
-			mydb="mysql"
-			dbcnt="$((${dbcnt} + 1))"
-		fi
-		if use postgres ; then
-			mydb="postgresql"
-			dbcnt="$((${dbcnt} + 1))"
-		fi
-		if use sqlite ; then
-			mydb="sqlite"
-			dbcnt="$((${dbcnt} + 1))"
-		fi
-		if use sqlite3 ; then
-			mydb="sqlite3"
-			dbcnt="$((${dbcnt} + 1))"
-		fi
-		export mydb="${mydb}"
-
-		if [[ "${dbcnt}" -eq 0 ]] ; then
-			eerror "To use ${P} it is required to set a database in the USE flags."
-			eerror "Supported databases are mysql, postgresql, sqlite, sqlite3"
-			die "You must set a supported database type."
-		fi
-	fi
-	if ! use bacula-clientonly ; then
-		if [[ "${dbcnt}" -gt 1 ]] ; then
-			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, sqlite, sqlite3"
-			die "Please set only one database type"
-		fi
-	fi
-
-	# create the daemon group and user
-	HAVE_BACULA_GROUP="`grep bacula\: /etc/group 2>/dev/null`"
-	if [ -z "${HAVE_BACULA_GROUP}" ]; then
-		enewgroup bacula
-		elog "The group bacula has been created. Any users you add to this"
-		elog "group have access to files created by the daemons."
-		elog ""
-	fi
-	if ! use bacula-clientonly ; then
-		HAVE_BACULA_USER="`id -u bacula 2>/dev/null`"
-		if [ -z "${HAVE_BACULA_USER}" ] ; then
-			enewuser "bacula" -1 -1 "/var/lib/bacula" "bacula,disk,tape,cdrom,cdrw"
-			elog "The user bacula has been created.  Please see the bacula manual"
-			elog "for information about running bacula as a non-root user."
-			elog ""
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	epatch "${FILESDIR}/${P}"-default-configs.patch
-	patch -p0 -f < "${FILESDIR}"/bacula-2.0.2-gnomesu2gksu.diff
-}
-
-src_compile() {
-	local myconf=""
-	if use bacula-clientonly ; then
-		myconf="${myconf} \
-			`use_enable bacula-clientonly client-only` \
-			`use_enable static static-fd`"
-	fi
-	if use bacula-console ; then
-		myconf="${myconf} \
-			`use_with X x` \
-			`use_enable gnome` \
-			`use_enable gnome tray-monitor` \
-			`use_enable wxwindows wx-console` \
-			`use_enable static static-cons`"
-	fi
-	myconf="${myconf} \
-		`use_with python` \
-		`use_with readline` \
-		`use_with ssl openssl` \
-		`use_with tcpd tcp-wrappers`"
-
-	if ! use bacula-clientonly; then
-		# select database support
-		if [ ${mydb} == "postgresql" ]; then
-			myconf="${myconf} `use_with postgres postgresql`"
-		else
-			myconf="${myconf} `use_with ${mydb}`"
-		fi
-		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} `use_enable static static-dir`"
-		fi
-		if ! use bacula-nosd ; then
-			myconf="${myconf} `use_enable static static-sd`"
-		fi
-
-	fi
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--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 "Configure failed!"
-
-	emake || die "Failed primary build!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed install to ${D} !"
-
-	if use static ; then
-		cd "${D}"/usr/sbin
-		mv static-bacula-fd bacula-fd
-		mv static-bconsole bconsole
-		if ! use bacula-clientonly ; then
-			mv static-bacula-dir bacula-dir
-			mv static-bacula-sd bacula-sd
-		fi
-		if use gnome ; then
-			mv static-gnome-console gnome-console
-		fi
-		cd "${S}"
-	fi
-
-	if use bacula-console ; then
-		if use gnome ; then
-			emake DESTDIR="${D}" \
-				install-menu \
-				install-menu-xsu || die "Failed to install gnome menu files to ${D}" \
-			make_desktop_entry \
-				"gnome-console -c /etc/bacula/gnome-console.conf" \
-				"Bacula Console" /usr/share/pixmaps/bacula.png "app-admin" \
-				"/usr/sbin"
-		fi
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly ; then
-	    # the database update scripts
-		diropts -m0750
-		dodir /usr/libexec/bacula/updatedb
-		insinto /usr/libexec/bacula/updatedb/
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		if use logrotate ; then
-			diropts -m0755
-			dodir /etc/logrotate.d
-			insinto /etc/logrotate.d
-			insopts -m0644
-			newins "${S}"/scripts/logrotate bacula
-		fi
-
-		# the logwatch scripts
-		if use logwatch ; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			cd "${S}"/scripts/logwatch
-			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts to ${D} !"
-			cd "${S}"
-		fi
-	fi
-
-	# documentation
-	for my_doc in "${S}"/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
-	do
-		dodoc "${my_doc}"
-	done
-	if use doc ; then
-		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers.pdf
-		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula.pdf
-		diropts -m0755
-		dodir /usr/share/doc/"${PF}"/developers
-		dodir /usr/share/doc/"${PF}"/manual
-		insopts -m0644
-		insinto /usr/share/doc/"${PF}"/developers
-		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers/*
-		insinto /usr/share/doc/"${PF}"/manual
-		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula/*
-	fi
-
-	# clean up permissions left broken by install
-	fperms 0644 "${D}"/usr/libexec/bacula/query.sql
-
-	# setup init scripts
-	my_services="fd"
-	if ! use bacula-clientonly ; then
-		if ! use bacula-nodir ; then
-			my_services="${my_services} dir"
-		fi
-		if ! use bacula-nosd ; then
-			my_services="${my_services} sd"
-		fi
-	fi
-	exeinto /etc/init.d/
-	insinto /etc/conf.d/
-	if use bacula-split-init ; then
-		my_scripts=""
-		for service in ${my_services} ; do
-			my_scripts="${my_scripts} bacula-${service}"
-		done
-	else
-		my_scripts="bacula-all"
-	fi
-	for script in ${my_scripts}; do
-		cp "${FILESDIR}/1.38.5/${script}"-conf "${T}/${script}".conf
-		cp "${FILESDIR}/1.38.5/${script}"-init "${T}/${script}".init
-		if [ "${mydb}" == "sqlite" ]; then
-			sed -i -e "s:%database%::" "${T}/${script}".init
-		else
-			sed -i -e "s:%database%:${mydb}:" "${T}/${script}".init
-		fi
-		sed -i -e "s:%services%:${my_services}:" "${T}/${script}".conf
-		newexe "${T}/${script}".init "${script}"
-		newins "${T}/${script}".conf "${script}"
-	done
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/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
-		elog "If this is a new install, you must create the ${mydb} databases with:"
-		elog " /usr/libexec/bacula/create_${mydb}_database"
-		elog " /usr/libexec/bacula/make_${mydb}_tables"
-		elog " /usr/libexec/bacula/grant_${mydb}_privileges"
-		elog ""
-		elog "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		elog "Please read the manual chapter for how to upgrade your database."
-		elog "You can find database upgrade scripts in /usr/libexec/bacula/updatedb."
-		elog ""
-	fi
-}
diff --git a/app-backup/bacula/bacula-2.0.2.ebuild b/app-backup/bacula/bacula-2.0.2.ebuild
deleted file mode 100644
index f1b831d58dfd..000000000000
--- a/app-backup/bacula/bacula-2.0.2.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.0.2.ebuild,v 1.4 2007/03/08 09:31:30 lisa Exp $
-
-#
-# TODO:
-# - install stuff from examples/:
-#	- examples/nagios/ + add nagios USE flag etc.
-#	  (see also example/reports/check_bacula_pools.sh which is newer
-#	  than examples/nagios/check_bacula_pools.sh)
-#   - examples/autochangers/
-#   - examples/devices/
-#   - examples/python/
-#   - examples/reports/baculareport.pl
-# - correctly filter unneeded /usr/libexec/bacula/ stuff depending
-#   on selected USE flags, e.g. bacula-clientonly
-# - install bacula-web and/or bweb from bacula-gui
-#
-
-inherit eutils
-
-IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd bacula-split-init doc gnome logrotate logwatch mysql postgres python readline sqlite sqlite3 ssl static tcpd wxwindows X"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-DOC_VER="${PV}"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz
-		doc? ( mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( >=dev-db/postgresql-7.4.0 )
-		mysql? ( virtual/mysql )
-		sqlite? ( =dev-db/sqlite-2* )
-		sqlite3? ( >=dev-db/sqlite-3.0.0 )
-		virtual/mta
-	)
-	bacula-console? (
-		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-		gnome? (
-			>=gnome-base/libgnome-2
-			x11-libs/gksu
-		)
-	)
-	ssl? ( dev-libs/openssl )
-	logrotate? ( app-admin/logrotate )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		sys-block/mtx
-		app-arch/mt-st
-	)"
-
-pkg_setup() {
-	local dbnum
-	declare -i dbnum=0
-	if ! useq bacula-clientonly; then
-		if useq mysql; then
-			export mydbtype='mysql'
-			let dbnum++
-		fi
-		if useq postgres; then
-			export mydbtype='postgresql'
-			let dbnum++
-		fi
-		if useq sqlite; then
-			export mydbtype='sqlite'
-			let dbnum++
-		fi
-		if useq 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, sqlite, 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, sqlite, sqlite3"
-			eerror
-			die "Multiple database types selected."
-		fi
-	fi
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula)" ]; 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 ! useq bacula-clientonly; then
-		if [ -z "$(egetent passwd bacula)" ]; 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_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src && epatch "${FILESDIR}/${P}"-default-configs.patch && popd
-
-	# replaces (deprecated) gnomesu with gksu in the gnome menu files
-	useq bacula-console && useq gnome && epatch "${FILESDIR}/${P}"-gnomesu2gksu.diff
-}
-
-src_compile() {
-	local myconf=''
-
-	if useq bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			--with-${mydbtype} \
-			$(use_enable static static-tools) \
-			$(use_enable static static-fd) \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		if ! useq bacula-nodir; then
-			myconf="${myconf} $(use_enable static static-dir)"
-		fi
-		if ! useq bacula-nosd; then
-			myconf="${myconf} $(use_enable static static-sd)"
-		fi
-
-	fi
-
-	if useq bacula-console; then
-		myconf="${myconf} \
-			$(use_with X x) \
-			$(use_enable gnome) \
-			$(use_enable gnome tray-monitor) \
-			$(use_enable wxwindows wx-console) \
-			$(use_enable static static-cons)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--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 "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# 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 useq static; then
-		pushd "${D}"/usr/sbin
-		mv static-bacula-fd bacula-fd
-		mv static-bconsole bconsole
-		if ! useq bacula-clientonly; then
-			mv static-bacula-dir bacula-dir
-			mv static-bacula-sd bacula-sd
-		fi
-		if useq bacula-console && useq gnome; then
-			mv static-gnome-console gnome-console
-		fi
-		popd
-	fi
-
-	# gnome-console menu entries using gksu
-	if useq bacula-console && useq gnome; then
-		emake DESTDIR="${D}" install-menu-xsu \
-			|| die "Failed to install gnome menu files"
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! useq bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		dodir /usr/libexec/bacula/updatedb
-		insinto /usr/libexec/bacula/updatedb/
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		if useq logrotate; then
-			diropts -m0755
-			dodir /etc/logrotate.d
-			insinto /etc/logrotate.d
-			insopts -m0644
-			newins "${S}"/scripts/logrotate bacula
-		fi
-
-		# the logwatch scripts
-		if useq logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			cd "${S}"/scripts/logwatch
-			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts"
-			cd "${S}"
-		fi
-	fi
-
-	# documentation
-	for d in "${S}"/{ChangeLog,LICENSE,README,ReleaseNotes,SUPPORT,kernstodo,projects}; do
-		dodoc "${d}"
-	done
-	if useq doc; then
-		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers.pdf
-		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula.pdf
-		diropts -m0755
-		dodir /usr/share/doc/"${PF}"/developers
-		dodir /usr/share/doc/"${PF}"/manual
-		insopts -m0644
-		insinto /usr/share/doc/"${PF}"/developers
-		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers/*
-		insinto /usr/share/doc/"${PF}"/manual
-		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula/*
-	fi
-
-	# setup init scripts
-	myservices="fd"
-	if ! useq bacula-clientonly; then
-		if ! useq bacula-nodir; then
-			myservices="${myservices} dir"
-		fi
-		if ! useq bacula-nosd; then
-			myservices="${myservices} sd"
-		fi
-	fi
-	exeinto /etc/init.d/
-	insinto /etc/conf.d/
-	if useq bacula-split-init; then
-		myscripts=""
-		for service in ${myservices}; do
-			myscripts="${myscripts} bacula-${service}"
-		done
-	else
-		myscripts="bacula-all"
-	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}"-conf "${T}/${script}".conf
-		cp "${FILESDIR}/${PV}/${script}"-init "${T}/${script}".init
-		# set database dependancy for the all-in-one and director init scripts
-		case "${mydbtype}" in
-			sqlite*)
-				# sqlite + sqlite3 databases don't have daemons
-				sed -i -e "s:%database%::" "${T}/${script}".init
-				;;
-			*)
-				# all other databases have daemons
-				sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".init
-				;;
-		esac
-		# set services for the all-in-one init script
-		sed -i -e "s:%services%:${myservices}:" "${T}/${script}".conf
-		# install init script and config
-		newexe "${T}/${script}".init "${script}"
-		newins "${T}/${script}".conf "${script}"
-	done
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-}
-
-pkg_postinst() {
-	if useq bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! useq bacula-clientonly && ! useq 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
-		einfo "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		einfo "Please read the manual chapter for how to upgrade your database."
-		einfo "You can find database upgrade scripts in /usr/libexec/bacula/updatedb."
-		einfo
-	fi
-}
diff --git a/app-backup/bacula/files/1.38.5/bacula-all-conf b/app-backup/bacula/files/1.38.5/bacula-all-conf
deleted file mode 100644
index b3f5e424d0cb..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-all-conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-all-conf,v 1.2 2006/06/14 15:57:07 lisa Exp $
-
-# Config file for /etc/init.d/bacula
-
-# Add on SERVICES the daemons you want to run
-# sd -
-# fd -
-# dir - 
-SERVICES="%services%"
-
-# If the database server where you store your bacula catalog
-# is on a different machine, please set this to 0.
-LOCAL_DB=1
-
-# Options for each daemon
-#  The DIR and SD 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"
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
-DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.38.5/bacula-all-init b/app-backup/bacula/files/1.38.5/bacula-all-init
deleted file mode 100644
index 5f1a2b5b928b..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-all-init
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-all-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
-
-depend() {
-	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns
-}
-
-start() {
-	local retval=0
-	for s in ${SERVICES} ; do
-		case ${s} in
-			sd)
-				ebegin "Starting bacula storage daemon"
-				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-					-- ${SD_OPTIONS}
-				retval=$(( $retval + $? ))
-				;;
-			fd)
-				ebegin "Starting bacula file daemon"
-				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-					-- ${FD_OPTIONS}
-				retval=$(( $retval + $? ))
-				;;
-			dir)
-				ebegin "Starting bacula director"
-				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-					-- ${DIR_OPTIONS}
-				retval=$(( $retval + $? ))
-				;;		
-		esac
-	done
-	eend $retval
-}
-
-stop() {
-	local retval=0
-	for s in ${SERVICES} ; do
-		case ${s} in
-			sd)
-				ebegin "Stopping bacula storage daemon"
-				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-				retval=$(( $retval + $? ))
-				;;
-			fd)
-				ebegin "Stopping bacula file daemon"
-				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-				retval=$(( $retval + $? ))
-				;;
-			dir)
-				ebegin "Stopping bacula director"
-				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-				retval=$(( $retval + $? ))
-				;;		
-		esac
-	done
-	eend $retval
-}
diff --git a/app-backup/bacula/files/1.38.5/bacula-dir-conf b/app-backup/bacula/files/1.38.5/bacula-dir-conf
deleted file mode 100644
index 398f6e7fd7e6..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-dir-conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-dir-conf,v 1.2 2006/06/14 15:57:07 lisa 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.
-LOCAL_DB=1
-
-# Options for each daemon
-#  The DIR and SD 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/1.38.5/bacula-dir-init b/app-backup/bacula/files/1.38.5/bacula-dir-init
deleted file mode 100644
index 2cd905e9a249..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-dir-init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-dir-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
-
-depend() {
-	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns
-}
-
-start() {
-	local retval=0
-	ebegin "Starting bacula director"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-		-- ${DIR_OPTIONS}
-	retval=$(( $retval + $? ))
-	eend $retval
-}
-
-stop() {
-	local retval=0
-	ebegin "Stopping bacula director"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-	retval=$(( $retval + $? ))
-	eend $retval
-}
diff --git a/app-backup/bacula/files/1.38.5/bacula-fd-conf b/app-backup/bacula/files/1.38.5/bacula-fd-conf
deleted file mode 100644
index f857b932b312..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-fd-conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-fd-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
-
-# Config file for /etc/init.d/bacula-fd
-
-# Options for each daemon
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/1.38.5/bacula-fd-init b/app-backup/bacula/files/1.38.5/bacula-fd-init
deleted file mode 100644
index 73046f427c5e..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-fd-init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-fd-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	local retval=0
-	ebegin "Starting bacula file daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-		-- ${FD_OPTIONS}
-	retval=$(( $retval + $? ))
-	eend $retval
-}
-
-stop() {
-	local retval=0
-	ebegin "Stopping bacula file daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-	retval=$(( $retval + $? ))
-	eend $retval
-}
diff --git a/app-backup/bacula/files/1.38.5/bacula-sd-conf b/app-backup/bacula/files/1.38.5/bacula-sd-conf
deleted file mode 100644
index fbfc0fa162f1..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-sd-conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-sd-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
-
-# Config file for /etc/init.d/bacula-sd
-
-# Options for each daemon
-#  The DIR and SD 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/1.38.5/bacula-sd-init b/app-backup/bacula/files/1.38.5/bacula-sd-init
deleted file mode 100644
index ee2bbc3deaca..000000000000
--- a/app-backup/bacula/files/1.38.5/bacula-sd-init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-sd-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	local retval=0
-	ebegin "Starting bacula storage daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-		-- ${SD_OPTIONS}
-	retval=$(( $retval + $? ))
-	eend $retval
-}
-
-stop() {
-	local retval=0
-	ebegin "Stopping bacula storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-	retval=$(( $retval + $? ))
-	eend $retval
-}
diff --git a/app-backup/bacula/files/2.0.2/bacula-all-conf b/app-backup/bacula/files/2.0.2/bacula-all-conf
deleted file mode 100644
index 32c19ef6cbe8..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-all-conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-all-conf,v 1.1 2007/02/28 14:40:44 wschlich Exp $
-
-# Config file for /etc/init.d/bacula
-
-# Add the daemons you want to run:
-# dir - Director (Master Control Program)
-# fd - File Daemon (Client)
-# sd - Storage Daemon
-SERVICES="%services%"
-
-# If the database server where you store your bacula catalog
-# is on a different machine, please set this to 0.
-LOCAL_DB=1
-
-# Options for each daemon.
-# The DIR and SD 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"
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
-DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/2.0.2/bacula-all-init b/app-backup/bacula/files/2.0.2/bacula-all-init
deleted file mode 100644
index b510d13fb1c0..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-all-init
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-all-init,v 1.1 2007/02/28 14:40:44 wschlich Exp $
-
-depend() {
-	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns
-}
-
-start() {
-	local retval
-	declare -i retval=0
-	for s in ${SERVICES} ; do
-		case ${s} in
-			sd)
-				ebegin "Starting bacula storage daemon"
-				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-					-- ${SD_OPTIONS}
-				let retval+=$?
-				;;
-			fd)
-				ebegin "Starting bacula file daemon"
-				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-					-- ${FD_OPTIONS}
-				let retval+=$?
-				;;
-			dir)
-				ebegin "Starting bacula director"
-				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-					-- ${DIR_OPTIONS}
-				let retval+=$?
-				;;		
-			*)
-				eerror "Unrecognized service found in SERVICES: '${s}'"
-				;;
-		esac
-	done
-	eend ${retval}
-}
-
-stop() {
-	local retval
-	declare -i retval=0
-	for s in ${SERVICES} ; do
-		case ${s} in
-			sd)
-				ebegin "Stopping bacula storage daemon"
-				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-				let retval+=$?
-				;;
-			fd)
-				ebegin "Stopping bacula file daemon"
-				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-				let retval+=$?
-				;;
-			dir)
-				ebegin "Stopping bacula director"
-				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-				let retval+=$?
-				;;		
-			*)
-				eerror "Unrecognized service found in SERVICES: '${s}'"
-				;;
-		esac
-	done
-	eend ${retval}
-}
diff --git a/app-backup/bacula/files/2.0.2/bacula-dir-conf b/app-backup/bacula/files/2.0.2/bacula-dir-conf
deleted file mode 100644
index 20631aea798e..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-dir-conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-dir-conf,v 1.1 2007/02/28 14:40:44 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.
-LOCAL_DB=1
-
-# Options for the director daemon.
-# The DIR 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/2.0.2/bacula-dir-init b/app-backup/bacula/files/2.0.2/bacula-dir-init
deleted file mode 100644
index ed111a3e3ea4..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-dir-init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-dir-init,v 1.1 2007/02/28 14:40:44 wschlich Exp $
-
-depend() {
-	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns
-}
-
-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/2.0.2/bacula-fd-conf b/app-backup/bacula/files/2.0.2/bacula-fd-conf
deleted file mode 100644
index a8f37b99c8e2..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-fd-conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-fd-conf,v 1.1 2007/02/28 14:40:44 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-fd
-
-# Options for the file director.
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/2.0.2/bacula-fd-init b/app-backup/bacula/files/2.0.2/bacula-fd-init
deleted file mode 100644
index fa2c3e6e8e78..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-fd-init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-fd-init,v 1.1 2007/02/28 14:40:44 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/2.0.2/bacula-sd-conf b/app-backup/bacula/files/2.0.2/bacula-sd-conf
deleted file mode 100644
index 47b9dcca22a7..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-sd-conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-sd-conf,v 1.1 2007/02/28 14:40:44 wschlich Exp $
-
-# Config file for /etc/init.d/bacula-sd
-
-# Options for the storage daemon.
-# The SD 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/2.0.2/bacula-sd-init b/app-backup/bacula/files/2.0.2/bacula-sd-init
deleted file mode 100644
index f89f9cf33b7f..000000000000
--- a/app-backup/bacula/files/2.0.2/bacula-sd-init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.2/bacula-sd-init,v 1.1 2007/02/28 14:40:44 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/bacula-1.38.5-default-configs.patch b/app-backup/bacula/files/bacula-1.38.5-default-configs.patch
deleted file mode 100644
index 6a50f12fade6..000000000000
--- a/app-backup/bacula/files/bacula-1.38.5-default-configs.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naru ../bacula-1.38.5/src/console/console.c ./src/console/console.c
---- ../bacula-1.38.5/src/console/console.c	2005-08-10 11:35:19.000000000 -0500
-+++ ./src/console/console.c	2006-01-31 21:07:50.000000000 -0600
-@@ -94,7 +94,7 @@
- static int sleepcmd(FILE *input, BSOCK *UA_sock);
- 
- 
--#define CONFIG_FILE "./bconsole.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/bconsole.conf"   /* default configuration file */
- 
- static void usage()
- {
-diff -Naru ../bacula-1.38.5/src/dird/dird.c ./src/dird/dird.c
---- ../bacula-1.38.5/src/dird/dird.c	2006-01-06 11:15:42.000000000 -0600
-+++ ./src/dird/dird.c	2006-01-31 21:08:13.000000000 -0600
-@@ -63,7 +63,7 @@
- extern URES res_all;
- 
- 
--#define CONFIG_FILE "./bacula-dir.conf" /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
- 
- static void usage()
- {
-diff -Naru ../bacula-1.38.5/src/filed/filed.c ./src/filed/filed.c
---- ../bacula-1.38.5/src/filed/filed.c	2006-01-15 04:11:59.000000000 -0600
-+++ ./src/filed/filed.c	2006-01-31 21:08:35.000000000 -0600
-@@ -47,7 +47,7 @@
- #endif
- 
- 
--#define CONFIG_FILE "./bacula-fd.conf" /* default config file */
-+#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
- 
- char *configfile = NULL;
- static bool foreground = false;
-diff -Naru ../bacula-1.38.5/src/gnome2-console/console.c ./src/gnome2-console/console.c
---- ../bacula-1.38.5/src/gnome2-console/console.c	2005-12-10 07:18:03.000000000 -0600
-+++ ./src/gnome2-console/console.c	2006-01-31 21:09:09.000000000 -0600
-@@ -80,7 +80,7 @@
- static guint initial;
- static int numdir = 0;
- 
--#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
- 
- static void usage()
- {
-diff -Naru ../bacula-1.38.5/src/stored/bcopy.c ./src/stored/bcopy.c
---- ../bacula-1.38.5/src/stored/bcopy.c	2005-08-10 11:35:37.000000000 -0500
-+++ ./src/stored/bcopy.c	2006-01-31 21:09:27.000000000 -0600
-@@ -44,7 +44,7 @@
- static uint32_t jobs = 0;
- static DEV_BLOCK *out_block;
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;                /* proceed inspite of I/O errors */
-diff -Naru ../bacula-1.38.5/src/stored/bextract.c ./src/stored/bextract.c
---- ../bacula-1.38.5/src/stored/bextract.c	2006-01-09 14:42:55.000000000 -0600
-+++ ./src/stored/bextract.c	2006-01-31 21:09:49.000000000 -0600
-@@ -57,7 +57,7 @@
- static uint32_t wsize;                /* write size */
- static uint64_t fileAddr = 0;         /* file write address */
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;
-diff -Naru ../bacula-1.38.5/src/stored/bls.c ./src/stored/bls.c
---- ../bacula-1.38.5/src/stored/bls.c	2005-10-26 09:02:05.000000000 -0500
-+++ ./src/stored/bls.c	2006-01-31 21:10:06.000000000 -0600
-@@ -51,7 +51,7 @@
- static uint32_t num_files = 0;
- static ATTR *attr;
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;
-diff -Naru ../bacula-1.38.5/src/stored/bscan.c ./src/stored/bscan.c
---- ../bacula-1.38.5/src/stored/bscan.c	2005-12-14 15:43:16.000000000 -0600
-+++ ./src/stored/bscan.c	2006-01-31 21:10:20.000000000 -0600
-@@ -95,7 +95,7 @@
- static int num_media = 0;
- static int num_files = 0;
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;                /* proceed inspite of I/O errors */
-diff -Naru ../bacula-1.38.5/src/stored/btape.c ./src/stored/btape.c
---- ../bacula-1.38.5/src/stored/btape.c	2006-01-09 16:34:33.000000000 -0600
-+++ ./src/stored/btape.c	2006-01-31 21:10:36.000000000 -0600
-@@ -85,7 +85,7 @@
- 
- 
- /* Static variables */
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- 
- #define MAX_CMD_ARGS 30
-diff -Naru ../bacula-1.38.5/src/stored/stored.c ./src/stored/stored.c
---- ../bacula-1.38.5/src/stored/stored.c	2005-12-19 08:06:41.000000000 -0600
-+++ ./src/stored/stored.c	2006-01-31 21:10:54.000000000 -0600
-@@ -37,7 +37,7 @@
- 
- extern "C" void *device_initialization(void *arg);
- 
--#define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"  /* Default config file */
- 
- /* Global variables exported */
- char OK_msg[]   = "3000 OK\n";
-diff -Naru ../bacula-1.38.5/src/tray-monitor/tray-monitor.c ./src/tray-monitor/tray-monitor.c
---- ../bacula-1.38.5/src/tray-monitor/tray-monitor.c	2005-11-22 04:50:55.000000000 -0600
-+++ ./src/tray-monitor/tray-monitor.c	2006-01-31 21:11:29.000000000 -0600
-@@ -94,7 +94,7 @@
- char** xpm_generic_var;
- static gboolean blinkstate = TRUE;
- 
--#define CONFIG_FILE "./tray-monitor.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/tray-monitor.conf"   /* default configuration file */
- 
- static void usage()
- {
diff --git a/app-backup/bacula/files/bacula-1.38.9-default-configs.patch b/app-backup/bacula/files/bacula-1.38.9-default-configs.patch
deleted file mode 100644
index 6a50f12fade6..000000000000
--- a/app-backup/bacula/files/bacula-1.38.9-default-configs.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naru ../bacula-1.38.5/src/console/console.c ./src/console/console.c
---- ../bacula-1.38.5/src/console/console.c	2005-08-10 11:35:19.000000000 -0500
-+++ ./src/console/console.c	2006-01-31 21:07:50.000000000 -0600
-@@ -94,7 +94,7 @@
- static int sleepcmd(FILE *input, BSOCK *UA_sock);
- 
- 
--#define CONFIG_FILE "./bconsole.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/bconsole.conf"   /* default configuration file */
- 
- static void usage()
- {
-diff -Naru ../bacula-1.38.5/src/dird/dird.c ./src/dird/dird.c
---- ../bacula-1.38.5/src/dird/dird.c	2006-01-06 11:15:42.000000000 -0600
-+++ ./src/dird/dird.c	2006-01-31 21:08:13.000000000 -0600
-@@ -63,7 +63,7 @@
- extern URES res_all;
- 
- 
--#define CONFIG_FILE "./bacula-dir.conf" /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
- 
- static void usage()
- {
-diff -Naru ../bacula-1.38.5/src/filed/filed.c ./src/filed/filed.c
---- ../bacula-1.38.5/src/filed/filed.c	2006-01-15 04:11:59.000000000 -0600
-+++ ./src/filed/filed.c	2006-01-31 21:08:35.000000000 -0600
-@@ -47,7 +47,7 @@
- #endif
- 
- 
--#define CONFIG_FILE "./bacula-fd.conf" /* default config file */
-+#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
- 
- char *configfile = NULL;
- static bool foreground = false;
-diff -Naru ../bacula-1.38.5/src/gnome2-console/console.c ./src/gnome2-console/console.c
---- ../bacula-1.38.5/src/gnome2-console/console.c	2005-12-10 07:18:03.000000000 -0600
-+++ ./src/gnome2-console/console.c	2006-01-31 21:09:09.000000000 -0600
-@@ -80,7 +80,7 @@
- static guint initial;
- static int numdir = 0;
- 
--#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
- 
- static void usage()
- {
-diff -Naru ../bacula-1.38.5/src/stored/bcopy.c ./src/stored/bcopy.c
---- ../bacula-1.38.5/src/stored/bcopy.c	2005-08-10 11:35:37.000000000 -0500
-+++ ./src/stored/bcopy.c	2006-01-31 21:09:27.000000000 -0600
-@@ -44,7 +44,7 @@
- static uint32_t jobs = 0;
- static DEV_BLOCK *out_block;
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;                /* proceed inspite of I/O errors */
-diff -Naru ../bacula-1.38.5/src/stored/bextract.c ./src/stored/bextract.c
---- ../bacula-1.38.5/src/stored/bextract.c	2006-01-09 14:42:55.000000000 -0600
-+++ ./src/stored/bextract.c	2006-01-31 21:09:49.000000000 -0600
-@@ -57,7 +57,7 @@
- static uint32_t wsize;                /* write size */
- static uint64_t fileAddr = 0;         /* file write address */
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;
-diff -Naru ../bacula-1.38.5/src/stored/bls.c ./src/stored/bls.c
---- ../bacula-1.38.5/src/stored/bls.c	2005-10-26 09:02:05.000000000 -0500
-+++ ./src/stored/bls.c	2006-01-31 21:10:06.000000000 -0600
-@@ -51,7 +51,7 @@
- static uint32_t num_files = 0;
- static ATTR *attr;
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;
-diff -Naru ../bacula-1.38.5/src/stored/bscan.c ./src/stored/bscan.c
---- ../bacula-1.38.5/src/stored/bscan.c	2005-12-14 15:43:16.000000000 -0600
-+++ ./src/stored/bscan.c	2006-01-31 21:10:20.000000000 -0600
-@@ -95,7 +95,7 @@
- static int num_media = 0;
- static int num_files = 0;
- 
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- STORES *me = NULL;                    /* our Global resource */
- bool forge_on = false;                /* proceed inspite of I/O errors */
-diff -Naru ../bacula-1.38.5/src/stored/btape.c ./src/stored/btape.c
---- ../bacula-1.38.5/src/stored/btape.c	2006-01-09 16:34:33.000000000 -0600
-+++ ./src/stored/btape.c	2006-01-31 21:10:36.000000000 -0600
-@@ -85,7 +85,7 @@
- 
- 
- /* Static variables */
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile = NULL;
- 
- #define MAX_CMD_ARGS 30
-diff -Naru ../bacula-1.38.5/src/stored/stored.c ./src/stored/stored.c
---- ../bacula-1.38.5/src/stored/stored.c	2005-12-19 08:06:41.000000000 -0600
-+++ ./src/stored/stored.c	2006-01-31 21:10:54.000000000 -0600
-@@ -37,7 +37,7 @@
- 
- extern "C" void *device_initialization(void *arg);
- 
--#define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"  /* Default config file */
- 
- /* Global variables exported */
- char OK_msg[]   = "3000 OK\n";
-diff -Naru ../bacula-1.38.5/src/tray-monitor/tray-monitor.c ./src/tray-monitor/tray-monitor.c
---- ../bacula-1.38.5/src/tray-monitor/tray-monitor.c	2005-11-22 04:50:55.000000000 -0600
-+++ ./src/tray-monitor/tray-monitor.c	2006-01-31 21:11:29.000000000 -0600
-@@ -94,7 +94,7 @@
- char** xpm_generic_var;
- static gboolean blinkstate = TRUE;
- 
--#define CONFIG_FILE "./tray-monitor.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/tray-monitor.conf"   /* default configuration file */
- 
- static void usage()
- {
diff --git a/app-backup/bacula/files/digest-bacula-1.36.3-r3 b/app-backup/bacula/files/digest-bacula-1.36.3-r3
deleted file mode 100644
index 89726d9250df..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.36.3-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9499d6277b8673ae7c24dcdbf89ee026 bacula-1.36.3.tar.gz 11153154
-RMD160 e8fb6eee221e261ac5b927019f9e69256cfb1732 bacula-1.36.3.tar.gz 11153154
-SHA256 5bae12451094b399df62dd8e325cba075a3e803f2e60658d28b7ed814161fbd6 bacula-1.36.3.tar.gz 11153154
-MD5 db08859bc193e777c76bcbf5e60f0c7e bacula-doc-1.36.3.tar.gz 4506465
-RMD160 bcb0d24c3b87bfa8408c1f550e7e1fdb0c4832c6 bacula-doc-1.36.3.tar.gz 4506465
-SHA256 ba60201567523a4dc0a5dbe286ef29dc7f4eba3e16dcd0168aef7936a67a3c5d bacula-doc-1.36.3.tar.gz 4506465
diff --git a/app-backup/bacula/files/digest-bacula-1.38.5 b/app-backup/bacula/files/digest-bacula-1.38.5
deleted file mode 100644
index 091761424dc8..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.38.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7f8f0f642b22dc2089ef7b42eb08f826 bacula-1.38.5.tar.gz 1911024
-RMD160 0ea7136ecaf0f30860e8d88216db68dde82276ee bacula-1.38.5.tar.gz 1911024
-SHA256 df760f15ba4667fbc1ac2d985b982920eb3a1d25c17ba744bc688f0f10fe47c7 bacula-1.38.5.tar.gz 1911024
-MD5 11035d75fdd9d10801f0b3dda1f09440 bacula-docs-1.38.5.tar.gz 23183760
-RMD160 40ea5da5046ee4fa4a5c494ee0038aee06d3cb39 bacula-docs-1.38.5.tar.gz 23183760
-SHA256 f83e60a33ac73eb35fce30ce5a1beecd596024068386a91662b43468bb42b853 bacula-docs-1.38.5.tar.gz 23183760
diff --git a/app-backup/bacula/files/digest-bacula-1.38.9 b/app-backup/bacula/files/digest-bacula-1.38.9
deleted file mode 100644
index 755e582c5c6e..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.38.9
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9378c7d9996d8e9d3506adb2570a33ac bacula-1.38.9.tar.gz 2063063
-RMD160 c735210438993e6bc656bdab5610e037112b573f bacula-1.38.9.tar.gz 2063063
-SHA256 b8f4c3df6b030712c7a9ffd04af0b948021dd6399420c18d918088e4f7105a77 bacula-1.38.9.tar.gz 2063063
-MD5 f56a5dae13f99557486be70c44cc1aae bacula-docs-1.38.9.tar.gz 22727098
-RMD160 a781602f70722a60f628ee890cef67cf270d5c1e bacula-docs-1.38.9.tar.gz 22727098
-SHA256 71c8a2950a55fd2a952e5d2f3b4777d0b7d29652dfdbd7a27e6c73034a22e32a bacula-docs-1.38.9.tar.gz 22727098
diff --git a/app-backup/bacula/files/digest-bacula-2.0.2 b/app-backup/bacula/files/digest-bacula-2.0.2
deleted file mode 100644
index db3b6ff03ecf..000000000000
--- a/app-backup/bacula/files/digest-bacula-2.0.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 299883ddd460336cfb613fd6d9bff989 bacula-2.0.2.tar.gz 2466754
-RMD160 94ef083b55a46126119cd30eac0758df9f8dc24b bacula-2.0.2.tar.gz 2466754
-SHA256 f72a7b0468652db18c6523dad39b798d58452b097be3b4f4cf1269f2deb657e1 bacula-2.0.2.tar.gz 2466754
-MD5 a114daae0e276ee274ccd558e42e13f0 bacula-docs-2.0.2.tar.gz 29776690
-RMD160 14c6582e9dabc4448fb681be192f46835ba0cb30 bacula-docs-2.0.2.tar.gz 29776690
-SHA256 1160405076fa2bc52c7c388d6b8bcfb9d692ffe794d9b22758ed9db7d9672b36 bacula-docs-2.0.2.tar.gz 29776690