removed old versions

(Portage version: 2.1.4.4)

24 files changed, 25 insertions, 980 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 263762b79ef2..3a723a552716 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-backup/bacula
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.49 2008/03/12 12:00:03 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.50 2008/03/19 13:38:53 wschlich Exp $
+
+  19 Mar 2008; Wolfram Schlich <wschlich@gentoo.org>
+  -files/bacula-1.36.3-cdrecord-configure.patch,
+  -files/bacula-1.36.3-default-configs.patch,
+  -files/bacula-doc-1.36.3-latex-icons.patch,
+  -files/bacula-1.36.3-mtxtmpfile.patch, -files/1.36.3/bacula-sd-init,
+  -files/bacula-2.0.2-default-configs.patch, files/2.0.3/bacula-all-init,
+  -files/bacula-2.0.2-gnomesu2gksu.diff, files/2.0.3/bacula-dir-init,
+  files/2.2.8/bacula-all-init, files/2.2.8/bacula-dir-init,
+  -files/bacula-conf, -files/bacula-init3, -files/randpass-1.37.40,
+  -files/1.36.3/bacula-all-conf, -files/1.36.3/bacula-all-init,
+  -files/1.36.3/bacula-dir-conf, -files/1.36.3/bacula-dir-init,
+  -files/1.36.3/bacula-fd-conf, -files/1.36.3/bacula-fd-init,
+  -files/1.36.3/bacula-sd-conf, metadata.xml, -bacula-1.36.3-r2.ebuild:
+  removed old versions
 
   11 Mar 2008; Wolfram Schlich <wschlich@gentoo.org>
   -files/2.2.4/bacula-all-conf, -files/2.2.4/bacula-all-init,
diff --git a/app-backup/bacula/bacula-1.36.3-r2.ebuild b/app-backup/bacula/bacula-1.36.3-r2.ebuild
deleted file mode 100644
index 155af52569ee..000000000000
--- a/app-backup/bacula/bacula-1.36.3-r2.ebuild
+++ /dev/null
@@ -1,185 +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-r2.ebuild,v 1.11 2007/04/28 16:40:25 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 hppa ppc sparc x86"
-IUSE="readline ncurses tcpd gnome mysql sqlite X static postgres client-only"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	sys-block/mtx
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	gnome? ( gnome-base/libgnome )
-	gnome? ( x11-libs/gksu )
-	sqlite? ( =dev-db/sqlite-2* )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.4.0 )
-	ncurses? ( sys-libs/ncurses )
-	virtual/mta
-	dev-libs/gmp"
-
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-pkg_setup() {
-	if ! use mysql && ! use postgres && ! use sqlite && ! use client-only; then
-		eerror "Bacula must compile with one database or client only."
-		eerror "Please add mysql, postgres, sqlite or client-only to your USE flags."
-		eerror "You may add the right USE flags on /etc/portage/package.use if you want to."
-		die "Invalid USE flags"
-	fi
-
-	if ( use mysql && use sqlite ) ||
-		( use mysql && use postgres ) ||
-		( use sqlite && use postgres ) ; then
-		eerror "For this ebuild to work, only one database may be selected."
-		eerror "Please select mysql, postgres OR sqlite only on the USE flags."
-		eerror "You may add the right USE flags on /etc/portage/package.use if you want to."
-		die "Invalid USE flags"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cdrecord-configure.patch
-	epatch ${FILESDIR}/${P}-mtxtmpfile.patch
-	cp ${FILESDIR}/randpass-1.37.40 ${S}/autoconf/randpass
-
-	# This changes the default conf files to /etc/bacula files
-	sed -i -e 's:"./gnome-console.conf":"/etc/bacula/gnome-console.conf":' \
-		src/gnome-console/console.c src/gnome2-console/console.c
-	sed -i -e 's:"./tray-monitor.conf":"/etc/bacula/tray-monitor.conf":' \
-		src/tray-monitor/tray-monitor.c
-	sed -i -e 's:"bacula-sd.conf":"/etc/bacula/bacula-sd.conf":' src/stored/bls.c \
-		src/stored/bextract.c src/stored/bcopy.c src/stored/bscan.c src/stored/btape.c \
-		src/stored/stored.c
-	sed -i -e 's:"./bacula-fd.conf":"/etc/bacula/bacula-fd.conf":' src/filed/filed.c
-	sed -i -e 's:"./bacula-dir.conf":"/etc/bacula/bacula-dir.conf":' src/dird/dird.c
-	sed -i -e 's:"./bconsole.conf":"/etc/bacula/bconsole.conf":' src/console/console.c
-	patch -p0 -f < "${FILESDIR}"/bacula-2.0.2-gnomesu2gksu.diff
-}
-
-src_compile() {
-	echo $TMPDIR
-	econf --enable-smartalloc \
-		--with-dir-user=root \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/bacula \
-		--with-scriptdir=/var/lib/bacula \
-		$(use_enable readline) \
-		$(use_enable gnome) \
-		$(use_enable static static-tools) \
-		$(use_enable static static-fd) \
-		$(use_enable static static-sd) \
-		$(use_enable static static-dir) \
-		$(use_enable static static-cons) \
-		$(use_enable gnome tray-monitor) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable X x) \
-		$(use_enable readline) \
-		$(use_enable client-only) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with sqlite) \
-		$(use_enable ncurses conio) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-
-	if use static ; then
-		cd ${D}/usr/sbin
-		mv static-bacula-fd bacula-fd
-		mv static-bconsole bconsole
-		if ! use client-only ; 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 gnome ; then
-		make_desktop_entry \
-			"gnome-console -c /etc/bacula/gnome-console.conf" \
-			"Bacula Console" /usr/share/pixmaps/bacula.png "app-admin" \
-			"/usr/sbin"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
-
-	insinto /var/lib/bacula/update
-	doins updatedb/update*
-
-	dodoc ChangeLog README ReleaseNotes
-
-	newinitd ${FILESDIR}/bacula-init3 bacula
-
-	# fix init script
-	if use mysql ; then
-		USEDB='use mysql'
-	elif use postgres ; then
-		USEDB='use postgres'
-	else
-		USEDB=''
-	fi
-	sed -i -e "s:%%USE_DB%%:${USEDB}:" ${D}/etc/init.d/bacula
-
-	newconfd ${FILESDIR}/bacula-conf bacula
-	if use client-only ; then
-		SERVICES='fd'
-	else
-		SERVICES='sd fd dir'
-	fi
-	sed -i -e "s:%%SERVICES%%:${SERVICES}:" ${D}/etc/conf.d/bacula
-
-	chgrp bacula ${D}/usr/sbin/*
-	chgrp -R bacula ${D}/etc/bacula
-}
-
-pkg_preinst() {
-	enewgroup bacula || die "problem adding group bacula"
-}
-
-pkg_postinst() {
-	# the working directory
-	install -m0750 -o root -g bacula -d ${ROOT}/var/bacula
-
-	if use mysql ; then DB="mysql" ; fi
-	if use postgres ; then DB="postgresql" ; fi
-	if use sqlite ; then DB="sqlite" ; fi
-
-	if ! use client-only ; then
-		elog "If this is a new install, you must create the ${DB} databases with:"
-		elog " /var/lib/bacula/create_${DB}_database"
-		elog " /var/lib/bacula/make_${DB}_tables"
-		elog " /var/lib/bacula/grant_${DB}_privileges"
-		elog
-		elog "If you're upgrading from a major release, you must upgrade your bacula database."
-		elog "Please read the manual chapter for how to upgrade your database."
-		elog "You can find database upgrade scripts on /var/lib/bacula."
-		elog
-	fi
-}
diff --git a/app-backup/bacula/files/1.36.3/bacula-all-conf b/app-backup/bacula/files/1.36.3/bacula-all-conf
deleted file mode 100644
index 8f918c3206a5..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/bacula-all-conf,v 1.1 2006/02/17 04:20:48 labmonkey 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 bacula -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.36.3/bacula-all-init b/app-backup/bacula/files/1.36.3/bacula-all-init
deleted file mode 100644
index f7489cfd0b0c..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/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.36.3/bacula-dir-conf b/app-backup/bacula/files/1.36.3/bacula-dir-conf
deleted file mode 100644
index f931ec7649dc..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/bacula-dir-conf,v 1.1 2006/02/17 04:20:48 labmonkey 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 bacula -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.36.3/bacula-dir-init b/app-backup/bacula/files/1.36.3/bacula-dir-init
deleted file mode 100644
index d45152eac630..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/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.36.3/bacula-fd-conf b/app-backup/bacula/files/1.36.3/bacula-fd-conf
deleted file mode 100644
index 651b0dff81cf..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/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.36.3/bacula-fd-init b/app-backup/bacula/files/1.36.3/bacula-fd-init
deleted file mode 100644
index 74d25ec9770f..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/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.36.3/bacula-sd-conf b/app-backup/bacula/files/1.36.3/bacula-sd-conf
deleted file mode 100644
index 5820942e7c06..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/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.36.3/bacula-sd-init b/app-backup/bacula/files/1.36.3/bacula-sd-init
deleted file mode 100644
index 63c9982cb9ba..000000000000
--- a/app-backup/bacula/files/1.36.3/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.36.3/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.3/bacula-all-init b/app-backup/bacula/files/2.0.3/bacula-all-init
index 928c4797d70b..6e088409c6e7 100644
--- a/app-backup/bacula/files/2.0.3/bacula-all-init
+++ b/app-backup/bacula/files/2.0.3/bacula-all-init
@@ -1,11 +1,11 @@
 #!/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.3/bacula-all-init,v 1.1 2007/03/10 21:41:31 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.3/bacula-all-init,v 1.2 2008/03/19 13:38:54 wschlich Exp $
 
 depend() {
 	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
+	if [ ""${LOCAL_DB}"" -eq 1 ]; then
 		need "%database%"
 	fi
 	use dns
diff --git a/app-backup/bacula/files/2.0.3/bacula-dir-init b/app-backup/bacula/files/2.0.3/bacula-dir-init
index 098b6923ebcc..e7af6dbf2748 100644
--- a/app-backup/bacula/files/2.0.3/bacula-dir-init
+++ b/app-backup/bacula/files/2.0.3/bacula-dir-init
@@ -1,11 +1,11 @@
 #!/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.3/bacula-dir-init,v 1.1 2007/03/10 21:41:31 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.0.3/bacula-dir-init,v 1.2 2008/03/19 13:38:54 wschlich Exp $
 
 depend() {
 	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
+	if [ ""${LOCAL_DB}"" -eq 1 ]; then
 		need "%database%"
 	fi
 	use dns
diff --git a/app-backup/bacula/files/2.2.8/bacula-all-init b/app-backup/bacula/files/2.2.8/bacula-all-init
index 1e8fc8971675..b4cb8526890c 100644
--- a/app-backup/bacula/files/2.2.8/bacula-all-init
+++ b/app-backup/bacula/files/2.2.8/bacula-all-init
@@ -1,11 +1,11 @@
 #!/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.2.8/bacula-all-init,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-all-init,v 1.2 2008/03/19 13:38:55 wschlich Exp $
 
 depend() {
 	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
+	if [ "${LOCAL_DB}" -eq 1 ]; then
 		need "%database%"
 	fi
 	use dns
diff --git a/app-backup/bacula/files/2.2.8/bacula-dir-init b/app-backup/bacula/files/2.2.8/bacula-dir-init
index 0da2235cd66a..45c9695e5877 100644
--- a/app-backup/bacula/files/2.2.8/bacula-dir-init
+++ b/app-backup/bacula/files/2.2.8/bacula-dir-init
@@ -1,11 +1,11 @@
 #!/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.2.8/bacula-dir-init,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-dir-init,v 1.2 2008/03/19 13:38:55 wschlich Exp $
 
 depend() {
 	need net
-	if [ ${LOCAL_DB} -eq 1 ]; then
+	if [ "${LOCAL_DB}" -eq 1 ]; then
 		need "%database%"
 	fi
 	use dns
diff --git a/app-backup/bacula/files/bacula-1.36.3-cdrecord-configure.patch b/app-backup/bacula/files/bacula-1.36.3-cdrecord-configure.patch
deleted file mode 100644
index 6fa8511484e3..000000000000
--- a/app-backup/bacula/files/bacula-1.36.3-cdrecord-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr bacula-1.36.2/configure bacula-1.36.2-fixed/configure
---- bacula-1.36.2/configure	2005-02-25 04:46:49.000000000 -0500
-+++ bacula-1.36.2-fixed/configure	2005-03-06 10:11:23.905848861 -0500
-@@ -7301,15 +7301,6 @@
- # get scsibus,target,lun
- # -------------------------------------------
- CDSTL="3,0,0"
--if test ! x$CDRECORD = x ; then
--   CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`
--   if test x${CDSTL} = x ; then
--      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`
--   fi
--   if test x${CDSTL} = x ; then
--      CDSTL="3,0,0"
--   fi
--fi
- 
- 
- 
diff --git a/app-backup/bacula/files/bacula-1.36.3-default-configs.patch b/app-backup/bacula/files/bacula-1.36.3-default-configs.patch
deleted file mode 100644
index ad1f84f0fd1b..000000000000
--- a/app-backup/bacula/files/bacula-1.36.3-default-configs.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -uNr ../bacula-1.36.3/src/console/console.c ./src/console/console.c
---- ../bacula-1.36.3/src/console/console.c	2005-04-05 12:23:51.000000000 -0500
-+++ ./src/console/console.c	2005-08-05 00:01:57.000000000 -0500
-@@ -97,7 +97,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 -uNr ../bacula-1.36.3/src/dird/dird.c ./src/dird/dird.c
---- ../bacula-1.36.3/src/dird/dird.c	2005-02-14 04:02:19.000000000 -0600
-+++ ./src/dird/dird.c	2005-08-05 00:01:32.000000000 -0500
-@@ -69,7 +69,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 -uNr ../bacula-1.36.3/src/filed/filed.c ./src/filed/filed.c
---- ../bacula-1.36.3/src/filed/filed.c	2005-02-14 04:02:23.000000000 -0600
-+++ ./src/filed/filed.c	2005-08-05 00:01:06.000000000 -0500
-@@ -51,7 +51,7 @@
- #endif
- 
- 
--#define CONFIG_FILE "./bacula-fd.conf" /* default config file */
-+#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
- 
- static char *configfile = NULL;
- static bool foreground = false;
-diff -uNr ../bacula-1.36.3/src/gnome-console/console.c ./src/gnome-console/console.c
---- ../bacula-1.36.3/src/gnome-console/console.c	2004-07-28 04:42:49.000000000 -0500
-+++ ./src/gnome-console/console.c	2005-08-04 23:55:32.000000000 -0500
-@@ -75,7 +75,7 @@
- static bool quit = FALSE;
- static guint initial;
- 
--#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
- 
- static void usage()
- {
-diff -uNr ../bacula-1.36.3/src/gnome2-console/console.c ./src/gnome2-console/console.c
---- ../bacula-1.36.3/src/gnome2-console/console.c	2005-02-25 03:47:07.000000000 -0600
-+++ ./src/gnome2-console/console.c	2005-08-04 23:56:00.000000000 -0500
-@@ -80,7 +80,7 @@
- static bool quit = false;
- static guint initial;
- 
--#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
- 
- static void usage()
- {
-diff -uNr ../bacula-1.36.3/src/stored/bcopy.c ./src/stored/bcopy.c
---- ../bacula-1.36.3/src/stored/bcopy.c	2004-09-19 13:56:27.000000000 -0500
-+++ ./src/stored/bcopy.c	2005-08-04 23:58:40.000000000 -0500
-@@ -46,7 +46,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;
- bool forge_on = true;
- 
-diff -uNr ../bacula-1.36.3/src/stored/bextract.c ./src/stored/bextract.c
---- ../bacula-1.36.3/src/stored/bextract.c	2005-02-15 05:51:04.000000000 -0600
-+++ ./src/stored/bextract.c	2005-08-04 23:57:57.000000000 -0500
-@@ -63,7 +63,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;
- bool forge_on = false;
- 
-diff -uNr ../bacula-1.36.3/src/stored/bls.c ./src/stored/bls.c
---- ../bacula-1.36.3/src/stored/bls.c	2005-02-15 05:51:04.000000000 -0600
-+++ ./src/stored/bls.c	2005-08-04 23:57:32.000000000 -0500
-@@ -53,7 +53,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;
- bool forge_on = false;
- 
-diff -uNr ../bacula-1.36.3/src/stored/bscan.c ./src/stored/bscan.c
---- ../bacula-1.36.3/src/stored/bscan.c	2005-02-14 04:02:27.000000000 -0600
-+++ ./src/stored/bscan.c	2005-08-04 23:58:58.000000000 -0500
-@@ -98,7 +98,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;
- bool forge_on = false;
- 
-diff -uNr ../bacula-1.36.3/src/stored/btape.c ./src/stored/btape.c
---- ../bacula-1.36.3/src/stored/btape.c	2005-02-27 15:53:29.000000000 -0600
-+++ ./src/stored/btape.c	2005-08-04 23:59:58.000000000 -0500
-@@ -85,7 +85,7 @@
- 
- 
- /* Static variables */
--#define CONFIG_FILE "bacula-sd.conf"
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
- char *configfile;
- 
- #define MAX_CMD_ARGS 30
-diff -uNr ../bacula-1.36.3/src/stored/stored.c ./src/stored/stored.c
---- ../bacula-1.36.3/src/stored/stored.c	2005-02-27 15:53:29.000000000 -0600
-+++ ./src/stored/stored.c	2005-08-05 00:00:19.000000000 -0500
-@@ -43,7 +43,7 @@
- 
- 
- 
--#define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
-+#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"  /* Default config file */
- 
- 
- /* Global variables exported */
-diff -uNr ../bacula-1.36.3/src/tray-monitor/tray-monitor.c ./src/tray-monitor/tray-monitor.c
---- ../bacula-1.36.3/src/tray-monitor/tray-monitor.c	2005-03-28 07:33:27.000000000 -0600
-+++ ./src/tray-monitor/tray-monitor.c	2005-08-04 23:56:37.000000000 -0500
-@@ -91,7 +91,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.36.3-mtxtmpfile.patch b/app-backup/bacula/files/bacula-1.36.3-mtxtmpfile.patch
deleted file mode 100644
index 12b4eded3fa9..000000000000
--- a/app-backup/bacula/files/bacula-1.36.3-mtxtmpfile.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- scripts/mtx-changer.in.orig	2005-10-07 07:41:38.000000000 +1000
-+++ scripts/mtx-changer.in	2005-10-07 07:41:52.000000000 +1000
-@@ -30,24 +37,37 @@
- MTX=@MTX@
- 
- #
-+# Create a temporary file
-+#
-+make_temp_file() {
-+  TMPFILE=`mktemp -t mtx.XXXXXXXXXX`
-+  if test x${TMPFILE} = x; then
-+     TMPFILE="@working_dir@/mtx.$$"
-+     if test -f ${TMPFILE}; then
-+	echo "Temp file security problem on: ${TMPFILE}"
-+	exit 1
-+     fi
-+  fi
-+}
-+
-+#
- # The purpose of this function to wait a maximum 
- #   time for the drive. It will
- #   return as soon as the drive is ready, or after
--#   waiting a maximum of 180 seconds.
-+#   waiting a maximum of 300 seconds.
- # Note, this is very system dependent, so if you are
- #   not running on Linux, you will probably need to
--#   re-write it.
--#
--# If you have a FreeBSD system, you might want to change
--#  the $(seq 180) to $(jot 180) -- tip from Brian McDonald
-+#   re-write it, or at least change the grep target.
- #
- wait_for_drive() {
--  for i in $(seq 180); do   # Wait max 180 seconds
-+  i=0 
-+  while [ $i -le 300 ]; do  # Wait max 300 seconds
-     if mt -f $1 status | grep ONLINE  >/dev/null 2>&1; then
-       break
-     fi
- #   echo "Device $1 - not ready, retrying..."
-     sleep 1
-+    i=`expr $i + 1`
-   done
- }
- 
-@@ -64,30 +84,21 @@
- cmd="$2"
- slot=$3
- device=$4
--# If drive not given, default to 0
--if test $# = 5 ; then
--  drive=$5
--else
--  drive=0
--fi
-+drive=$5
-+
- 
- #
- # Check for special cases where only 2 arguments are needed, 
- #  all others are a minimum of 3
- case $cmd in
--   loaded)
--     ;;
--   unload)
--     ;;
-    list)
-      ;;
-    slots)
-      ;;
-    *)
--     if test $# -lt 3; then
-+     if test $# -lt 5; then
- 	echo "usage: mtx-changer ctl-device command slot archive-device drive"
- 	echo "	Insufficient number of arguments arguments given."
--	echo "	Mimimum usage is first three arguments ..."
- 	exit 1
-      fi
-      ;;
-@@ -100,11 +111,7 @@
- #
- # enable the following line if you need to eject the cartridge
- #     mt -f $device offline
--      if test x$slot = x; then
--	 ${MTX} -f $ctl unload
--      else
--	 ${MTX} -f $ctl unload $slot $drive
--      fi
-+      ${MTX} -f $ctl unload $slot $drive
-       ;;
- 
-    load)
-@@ -120,27 +127,33 @@
-       ;;
- 
-    list) 
--#     echo "Requested list"
--      ${MTX} -f $ctl status | grep " *Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
--# Comment out the previous line and add a line here
--# to print "fake" barcodes.
-+#     echo "Doing mtx -f $ctl -- to list volumes"
-+      make_temp_file
-+      ${MTX} -f $ctl status >${TMPFILE}
-+      rtn=$?
-+      cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
-+      cat ${TMPFILE} | grep "^Data Transfer Element [0-9]*:Full (Storage Element [0-9]" | awk '{printf "%s:%s\n",$7,$10}'
-+      rm -f ${TMPFILE} 2>&1 >/dev/null
- #
- # If you have a VXA PacketLoader and the above does not work, try
- #  turning it off and enabling the following line.
- #     ${MTX} -f $ctl status | grep " *Storage Element [0-9]*:.*Full" | sed "s/*Storage Element //" | sed "s/Full :VolumeTag=//"
-+      exit $rtn
-       ;;
- 
-    loaded)
--      ${MTX} -f $ctl status >/tmp/mtx.$$
-+#     echo "Doing mtx -f $ctl $drive -- to find what is loaded"
-+      make_temp_file
-+      ${MTX} -f $ctl status >${TMPFILE}
-       rtn=$?
--      cat /tmp/mtx.$$ | grep "^Data Transfer Element $drive:Full" | awk "{print \$7}"
--      cat /tmp/mtx.$$ | grep "^Data Transfer Element $drive:Empty" | awk "{print 0}"
--      rm -f /tmp/mtx.$$
-+      cat ${TMPFILE} | grep "^Data Transfer Element $drive:Full" | awk "{print \$7}"
-+      cat ${TMPFILE} | grep "^Data Transfer Element $drive:Empty" | awk "{print 0}"
-+      rm -f ${TMPFILE} 2>&1 >/dev/null
-       exit $rtn
-       ;;
- 
-    slots)
--#     echo "Request slots"
-+#     echo "Doing mtx -f $ctl -- to get count of slots"
-       ${MTX} -f $ctl status | grep " *Storage Changer" | awk "{print \$5}"
-       ;;
- esac
diff --git a/app-backup/bacula/files/bacula-2.0.2-default-configs.patch b/app-backup/bacula/files/bacula-2.0.2-default-configs.patch
deleted file mode 100644
index 9f699b8cb595..000000000000
--- a/app-backup/bacula/files/bacula-2.0.2-default-configs.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- stored/bcopy.c	2006-11-27 05:03:01.000000000 -0500
-+++ stored/bcopy.c	2007-01-11 21:14:58.883253250 -0500
-@@ -57,7 +57,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 */
---- stored/bextract.c	2006-12-01 03:45:13.000000000 -0500
-+++ stored/bextract.c	2007-01-11 21:13:33.333906750 -0500
-@@ -64,7 +64,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;
---- stored/bls.c	2006-12-13 14:42:12.000000000 -0500
-+++ stored/bls.c	2007-01-11 21:13:47.850814000 -0500
-@@ -59,7 +59,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;
---- stored/bscan.c	2006-12-01 03:45:13.000000000 -0500
-+++ stored/bscan.c	2007-01-11 21:14:05.375909250 -0500
-@@ -100,7 +100,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 */
---- stored/btape.c	2006-12-14 06:41:00.000000000 -0500
-+++ stored/btape.c	2007-01-11 21:14:29.265402250 -0500
-@@ -98,7 +98,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
---- tray-monitor/tray-monitor.c	2006-12-01 03:45:14.000000000 -0500
-+++ tray-monitor/tray-monitor.c	2007-01-11 21:17:29.828686750 -0500
-@@ -101,7 +101,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()
- {
---- dird/dird.c	2006-12-22 10:01:05.000000000 -0500
-+++ dird/dird.c	2007-01-11 21:18:16.255588250 -0500
-@@ -83,7 +83,7 @@
- extern URES res_all;
- #endif
- 
--#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
-+#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
- 
- static void usage()
- {
---- console/console.c	2006-11-27 05:02:59.000000000 -0500
-+++ console/console.c	2007-01-11 21:18:36.580858500 -0500
-@@ -104,7 +104,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()
- {
---- gnome2-console/console.c	2006-12-08 09:27:10.000000000 -0500
-+++ gnome2-console/console.c	2007-01-11 21:19:17.287402500 -0500
-@@ -93,7 +93,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()
- {
---- filed/filed.c	2006-11-27 05:03:00.000000000 -0500
-+++ filed/filed.c	2007-01-11 21:20:13.722929500 -0500
-@@ -49,7 +49,7 @@
- bool no_signals = false;
- 
- 
--#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 --git a/app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff b/app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff
deleted file mode 100644
index 015ad5940eaf..000000000000
--- a/app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN scripts/bacula.desktop.gnome1.xsu.in scripts/bacula.desktop.gnome1.xsu.in
---- scripts/bacula.desktop.gnome1.xsu.in	2004-03-28 19:08:45.000000000 +0200
-+++ scripts/bacula.desktop.gnome1.xsu.in	2007-02-28 16:36:14.000000000 +0100
-@@ -2,7 +2,7 @@
- Name=Bacula Console
- Comment=Bacula Director Console
- Icon=/usr/share/pixmaps/bacula.png
--Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
-+Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf"
- Terminal=false
- Type=Application
- Encoding=UTF-8
-diff -urN scripts/bacula.desktop.gnome2.xsu.in scripts/bacula.desktop.gnome2.xsu.in
---- scripts/bacula.desktop.gnome2.xsu.in	2004-03-28 19:08:45.000000000 +0200
-+++ scripts/bacula.desktop.gnome2.xsu.in	2007-02-28 16:36:25.000000000 +0100
-@@ -2,7 +2,7 @@
- Name=Bacula Console
- Comment=Bacula Director Console
- Icon=/usr/share/pixmaps/bacula.png
--Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
-+Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf"
- Terminal=false
- Type=Application
- Encoding=UTF-8
-diff -urN scripts/wxconsole.desktop.xsu.in scripts/wxconsole.desktop.xsu.in
---- scripts/wxconsole.desktop.xsu.in	2006-04-16 18:01:52.000000000 +0200
-+++ scripts/wxconsole.desktop.xsu.in	2007-02-28 16:35:25.000000000 +0100
-@@ -2,7 +2,7 @@
- Name=Bacula WX Console
- Comment=Bacula Director Console
- Icon=/usr/share/pixmaps/wxwin16x16.xpm
--Exec=gnomesu -t "Query" -c "@sbindir@/wxconsole -c @sysconfdir@/wxconsole.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required."
-+Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/wxconsole -c @sysconfdir@/wxconsole.conf"
- Terminal=false
- Type=Application
- Encoding=UTF-8
diff --git a/app-backup/bacula/files/bacula-conf b/app-backup/bacula/files/bacula-conf
deleted file mode 100644
index 5c6afcf85a93..000000000000
--- a/app-backup/bacula/files/bacula-conf
+++ /dev/null
@@ -1,16 +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/bacula-conf,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
-
-# Config file for /etc/init.d/bacula
-
-# Add on SERVICES the daemons you want to run
-# sd -
-# fd -
-# dir - 
-SERVICES="%%SERVICES%%"
-
-# Options for each daemon
-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/bacula-doc-1.36.3-latex-icons.patch b/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch
deleted file mode 100644
index 254c89ba9f8a..000000000000
--- a/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- html-manual/bacula.html.orig	2005-10-24 14:11:08.000000000 -0500
-+++ html-manual/bacula.html	2005-10-24 14:35:53.000000000 -0500
-@@ -24,18 +24,9 @@
- </HEAD>
- 
- <BODY >
--<!--Navigation Panel-->
--<IMG WIDTH="81" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next_inactive"
-- SRC="file:/usr/share/latex2html/icons/nx_grp_g.png"> 
--<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
-- SRC="file:/usr/share/latex2html/icons/up_g.png"> 
--<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
-- SRC="file:/usr/share/latex2html/icons/prev_g.png">   
- <BR>
- <BR>
- <BR>
--<!--End of Navigation Panel-->
--
- <P>
- 
- <P>
-@@ -36405,15 +36396,7 @@
-  <STRONG>latex2html</STRONG> <TT>-white -no_subdir -split 0 -toc_stars -white -notransparent bacula</TT>
- <P>
- The translation was initiated by  on 2005-04-26<HR>
--<!--Navigation Panel-->
--<IMG WIDTH="81" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next_inactive"
-- SRC="file:/usr/share/latex2html/icons/nx_grp_g.png"> 
--<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
-- SRC="file:/usr/share/latex2html/icons/up_g.png"> 
--<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
-- SRC="file:/usr/share/latex2html/icons/prev_g.png">   
- <BR>
--<!--End of Navigation Panel-->
- <ADDRESS>
- 
- 2005-04-26
diff --git a/app-backup/bacula/files/bacula-init3 b/app-backup/bacula/files/bacula-init3
deleted file mode 100644
index a3329070ca41..000000000000
--- a/app-backup/bacula/files/bacula-init3
+++ /dev/null
@@ -1,60 +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/bacula-init3,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
-
-depend() {
-		need net
-		%%USE_DB%%
-}
-
-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/randpass-1.37.40 b/app-backup/bacula/files/randpass-1.37.40
deleted file mode 100644
index af30bfb929bb..000000000000
--- a/app-backup/bacula/files/randpass-1.37.40
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-#
-#   Generate a random password, written to standard output
-#   By John Walker
-#
-if test "x$1" = "x" ; then
-   PWL=48      # Password length in characters
-else
-   PWL=$1
-fi 
-tmp=`mktemp randpass.XXXXXXXXXX`
-if test x$tmp = x; then
-   tmp=/tmp/p.tmp.$$    
-   if test -f $tmp; then
-      echo "Temp file security problem on: $tmp"
-      exit 1
-   fi
-fi
-cp autoconf/randpass.bc $tmp
-ps | sum | tr -d ':[:alpha:] ' | sed 's/^/k=/' >>$tmp
-date | tr -d ':[:alpha:] ' | sed 's/^/k=k*/' >>$tmp
-ls -l /tmp | sum | tr -d ':[:alpha:] ' | sed 's/^/k=k*/' >>$tmp
-echo "j=s(k); for (i = 0; i < $PWL; i++) r()" >>$tmp
-echo "quit" >>$tmp
-bc $tmp | awk -f autoconf/randpass.awk
-rm $tmp
diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
index 592e50bc9e38..9d376cc33504 100644
--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/metadata.xml
@@ -5,6 +5,6 @@
 	<maintainer>
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>
-		<description>Maintainer of 2.0 branch only</description>
+		<description>Primary maintainer</description>
 	</maintainer>
 </pkgmetadata>