Revision bump for 1.36.3 to include docs, use separate init scripts per bacula-split-init USE flag, and port to modular-x compatibility. Added 1.38.5 ebuild.

(Portage version: 2.0.51.22-r2)

24 files changed, 1225 insertions, 3 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index e3b1975dd630..c34d10c2afd8 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-backup/bacula
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.8 2005/10/11 19:36:24 dragonheart Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.9 2006/02/17 04:20:48 labmonkey Exp $
+
+*bacula-1.38.5 (17 Feb 2006)
+*bacula-1.36.3-r3 (17 Feb 2006)
+
+  17 Feb 2006; Chris Lee <labmonkey@gentoo.org>
+  +files/bacula-1.36.3-default-configs.patch,
+  +files/bacula-doc-1.36.3-latex-icons.patch, +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,
+  +files/1.36.3/bacula-sd-init, +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, +bacula-1.36.3-r3.ebuild,
+  +bacula-1.38.5.ebuild:
+  Revision bump. Modular X fix, docs handling, single/multiple init scripts
+  USE controlled. Added 1.38.5 ebuild.
 
   11 Oct 2005; Daniel Black <dragonheart@gentoo.org> -files/bacula-init,
   -bacula-1.34.4.ebuild:
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index da6ca09405e3..c7d3455a6cd8 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,9 +1,31 @@
-MD5 3da2999b4f9eebb5882d418236049346 ChangeLog 9703
+MD5 d3da29fc1bbd6f7bbcb10fbd6be5001c ChangeLog 10576
 MD5 2cd99c3b1d7596e5df18f6e81403bfda bacula-1.36.3-r2.ebuild 5516
 MD5 60588f35f6dd9ba53f0b06f43e6a069b metadata.xml 231
+MD5 2f87f1d266059b981a61aee645b18d10 bacula-1.36.3-r3.ebuild 8048
+MD5 1b0f2233646c1287e18e9f9bc2a43b13 bacula-1.38.5.ebuild 7928
 MD5 42374b055f69dd5eb5eebe2b17542c03 files/bacula-1.36.3-cdrecord-configure.patch 616
 MD5 fb24badd7d80c46f5bdb1dd2c8ee249b files/bacula-1.36.3-mtxtmpfile.patch 3994
 MD5 c8ead9a2d0974cccce147e7c1780dc60 files/bacula-conf 562
 MD5 03ffd8d0949fd8fd22690ecfbadce1df files/bacula-init3 1479
 MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3-r2 67
 MD5 48a955f044c868aefad5bf4ff3991deb files/randpass-1.37.40 682
+MD5 4d5de2bae25b3042d9e9fe5586376b6e files/bacula-1.36.3-default-configs.patch 5373
+MD5 de819ab74a17fa1a652ab8dcae49f9d2 files/bacula-doc-1.36.3-latex-icons.patch 1284
+MD5 b3e61980cda1b1be28c8544ffbc72e68 files/digest-bacula-1.36.3-r3 137
+MD5 b0fe858eafc10d730f3c7e7971875b87 files/digest-bacula-1.38.5 138
+MD5 663ba79e99cf103ec8ea8dcb9caa7b11 files/1.36.3/bacula-all-init 1431
+MD5 a7eae591d7500b54408e36babdb64a70 files/1.36.3/bacula-dir-init 593
+MD5 c860993ce4f60cd71286ab6dc37dbaa1 files/1.36.3/bacula-fd-init 540
+MD5 7cecbd3935bdcdbaef7e781a3e5328cb files/1.36.3/bacula-sd-conf 395
+MD5 ad350f67d766559c465a848b1a551233 files/1.36.3/bacula-sd-init 547
+MD5 77fa4d8063339bc9676ec90959edd1ba files/1.36.3/bacula-dir-conf 524
+MD5 6dd20705d104391b78b6bab2c3d9ccae files/1.36.3/bacula-fd-conf 249
+MD5 34b2cd207ddfe7361ff8991dc772a478 files/1.36.3/bacula-all-conf 734
+MD5 77fa4d8063339bc9676ec90959edd1ba files/1.38.5/bacula-dir-conf 524
+MD5 6dd20705d104391b78b6bab2c3d9ccae files/1.38.5/bacula-fd-conf 249
+MD5 7cecbd3935bdcdbaef7e781a3e5328cb files/1.38.5/bacula-sd-conf 395
+MD5 ad350f67d766559c465a848b1a551233 files/1.38.5/bacula-sd-init 547
+MD5 a7eae591d7500b54408e36babdb64a70 files/1.38.5/bacula-dir-init 593
+MD5 c860993ce4f60cd71286ab6dc37dbaa1 files/1.38.5/bacula-fd-init 540
+MD5 34b2cd207ddfe7361ff8991dc772a478 files/1.38.5/bacula-all-conf 734
+MD5 663ba79e99cf103ec8ea8dcb9caa7b11 files/1.38.5/bacula-all-init 1431
diff --git a/app-backup/bacula/bacula-1.36.3-r3.ebuild b/app-backup/bacula/bacula-1.36.3-r3.ebuild
new file mode 100644
index 000000000000..c2964ca68459
--- /dev/null
+++ b/app-backup/bacula/bacula-1.36.3-r3.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2006 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.1 2006/02/17 04:20:48 labmonkey 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? ( >=dev-db/mysql-3.23 )
+		!mysql? (
+			postgres? ( >=dev-db/postgresql-7.4.0 )
+			!postgres? (
+				sqlite? ( =dev-db/sqlite-2* )
+				!sqlite? ( >=dev-db/mysql-3.23 )
+			)
+		)
+		virtual/mta
+	)
+	bacula-console? (
+		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
+		gnome? (
+			>=gnome-base/gnome-2
+			>=gnome-base/libgnome-2
+			app-admin/gnomesu
+		)
+	)
+	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
+		einfo "The group bacula has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo ""
+	fi
+	if ! use bacula-clientonly ; then
+		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"
+			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}
+	# 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
+
+	# 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
+	prepall
+
+	# 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
+		einfo "If this is a new install, you must create the ${mydb} databases with:"
+		einfo " /usr/libexec/bacula/create_${mydb}_database"
+		einfo " /usr/libexec/bacula/grant_${mydb}_privileges"
+		einfo " /usr/libexec/bacula/make_${mydb}_tables"
+		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/bacula-1.38.5.ebuild b/app-backup/bacula/bacula-1.38.5.ebuild
new file mode 100644
index 000000000000..f50d42e64a85
--- /dev/null
+++ b/app-backup/bacula/bacula-1.38.5.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2006 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.1 2006/02/17 04:20:48 labmonkey 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? ( >=dev-db/mysql-3.23 )
+		!mysql? (
+			postgres? ( >=dev-db/postgresql-7.4.0 )
+			!postgres? (
+				sqlite? ( =dev-db/sqlite-2* )
+				!sqlite? ( >=dev-db/mysql-3.23 )
+			)
+		)
+		virtual/mta
+	)
+	bacula-console? (
+		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
+		gnome? (
+			>=gnome-base/gnome-2
+			>=gnome-base/libgnome-2
+			app-admin/gnomesu
+		)
+	)
+	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
+		einfo "The group bacula has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo ""
+	fi
+	if ! use bacula-clientonly ; then
+		HAVE_BACULA_USER="`id -u bacula 2>/dev/null`"
+		if [ -z "${HAVE_BACULA_USER}" ] ; then
+			enewuser "bacula" -1 "/bin/false" "/var/lib/bacula" "bacula,disk,tape,cdrom,cdrw"
+			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>
+	epatch ${FILESDIR}/${P}-default-configs.patch
+}
+
+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
+	prepall
+
+	# 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
+		einfo "If this is a new install, you must create the ${mydb} databases with:"
+		einfo " /usr/libexec/bacula/create_${mydb}_database"
+		einfo " /usr/libexec/bacula/grant_${mydb}_privileges"
+		einfo " /usr/libexec/bacula/make_${mydb}_tables"
+		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.36.3/bacula-all-conf b/app-backup/bacula/files/1.36.3/bacula-all-conf
new file mode 100644
index 000000000000..8f918c3206a5
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-all-conf
@@ -0,0 +1,23 @@
+# 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
new file mode 100644
index 000000000000..f7489cfd0b0c
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-all-init
@@ -0,0 +1,63 @@
+#!/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
new file mode 100644
index 000000000000..f931ec7649dc
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-dir-conf
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 000000000000..d45152eac630
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-dir-init
@@ -0,0 +1,29 @@
+#!/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
new file mode 100644
index 000000000000..651b0dff81cf
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-fd-conf
@@ -0,0 +1,8 @@
+# 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
new file mode 100644
index 000000000000..74d25ec9770f
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-fd-init
@@ -0,0 +1,26 @@
+#!/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
new file mode 100644
index 000000000000..5820942e7c06
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-sd-conf
@@ -0,0 +1,11 @@
+# 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
new file mode 100644
index 000000000000..63c9982cb9ba
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-sd-init
@@ -0,0 +1,26 @@
+#!/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/1.38.5/bacula-all-conf b/app-backup/bacula/files/1.38.5/bacula-all-conf
new file mode 100644
index 000000000000..2ebd110f174e
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-all-conf
@@ -0,0 +1,23 @@
+# 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.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.38.5/bacula-all-init b/app-backup/bacula/files/1.38.5/bacula-all-init
new file mode 100644
index 000000000000..5f1a2b5b928b
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-all-init
@@ -0,0 +1,63 @@
+#!/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
new file mode 100644
index 000000000000..2280a838a649
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-dir-conf
@@ -0,0 +1,15 @@
+# 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.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.38.5/bacula-dir-init b/app-backup/bacula/files/1.38.5/bacula-dir-init
new file mode 100644
index 000000000000..2cd905e9a249
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-dir-init
@@ -0,0 +1,29 @@
+#!/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
new file mode 100644
index 000000000000..f857b932b312
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-fd-conf
@@ -0,0 +1,8 @@
+# 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
new file mode 100644
index 000000000000..73046f427c5e
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-fd-init
@@ -0,0 +1,26 @@
+#!/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
new file mode 100644
index 000000000000..fbfc0fa162f1
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-sd-conf
@@ -0,0 +1,11 @@
+# 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
new file mode 100644
index 000000000000..ee2bbc3deaca
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-sd-init
@@ -0,0 +1,26 @@
+#!/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/bacula-1.36.3-default-configs.patch b/app-backup/bacula/files/bacula-1.36.3-default-configs.patch
new file mode 100644
index 000000000000..ad1f84f0fd1b
--- /dev/null
+++ b/app-backup/bacula/files/bacula-1.36.3-default-configs.patch
@@ -0,0 +1,144 @@
+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-doc-1.36.3-latex-icons.patch b/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch
new file mode 100644
index 000000000000..254c89ba9f8a
--- /dev/null
+++ b/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch
@@ -0,0 +1,37 @@
+--- 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/digest-bacula-1.36.3-r3 b/app-backup/bacula/files/digest-bacula-1.36.3-r3
new file mode 100644
index 000000000000..b45ff07e65b4
--- /dev/null
+++ b/app-backup/bacula/files/digest-bacula-1.36.3-r3
@@ -0,0 +1,2 @@
+MD5 9499d6277b8673ae7c24dcdbf89ee026 bacula-1.36.3.tar.gz 11153154
+MD5 db08859bc193e777c76bcbf5e60f0c7e 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
new file mode 100644
index 000000000000..d9fbab663c1d
--- /dev/null
+++ b/app-backup/bacula/files/digest-bacula-1.38.5
@@ -0,0 +1,2 @@
+MD5 7f8f0f642b22dc2089ef7b42eb08f826 bacula-1.38.5.tar.gz 1911024
+MD5 11035d75fdd9d10801f0b3dda1f09440 bacula-docs-1.38.5.tar.gz 23183760