1.36.3-r1 rewritten ebuild

Package-Manager: portage-2.0.51.22-r1

16 files changed, 321 insertions, 816 deletions

diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index 4af7fba994b3..8579b873ee9b 100644
--- a/app-admin/bacula/ChangeLog
+++ b/app-admin/bacula/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/bacula
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.49 2005/07/01 11:59:04 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.50 2005/07/03 03:58:53 fserb Exp $
+
+*bacula-1.36.3-r1 (03 Jul 2005)
+
+  03 Jul 2005; Fernando Serboncini <fserb@gentoo.org>
+  +files/bacula-1.36.3-cdrecord-configure.patch,
+  -files/1.32f/1.32f-1-weekofmonth.patch,
+  -files/1.32f/1.32f-2-eom-nextvol.patch, +files/bacula-conf,
+  +files/bacula-init3, metadata.xml, -bacula-1.32f.ebuild,
+  -bacula-1.32f-r5.ebuild, -bacula-1.34.1.ebuild, +bacula-1.36.3-r1.ebuild:
+  removed old versions.
+  Completely rewritten ebuild.
 
 *bacula-1.36.3 (01 Jul 2005)
 
diff --git a/app-admin/bacula/Manifest b/app-admin/bacula/Manifest
index 278378b4ce35..197a62bd98ed 100644
--- a/app-admin/bacula/Manifest
+++ b/app-admin/bacula/Manifest
@@ -1,27 +1,34 @@
-MD5 83e4f6b6f66ab9a9625f34207084c198 bacula-1.36.0.ebuild 9229
-MD5 ec5fd66209d4ce884a9ec67fba51f7cc bacula-1.34.6.ebuild 4433
-MD5 83c73777866bd9f87d9d215deb1677cb bacula-1.34.1.ebuild 3605
-MD5 0ec66074f9a978d2d95797fe64ae9fc2 bacula-1.34.5.ebuild 4434
-MD5 2146982309de17e1c1d29cc1a1a460dd bacula-1.32f.ebuild 3892
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6b3619650423031dd77a61a28d180a65 ChangeLog 7756
 MD5 061c04a7448b7b81ec1b3416fb8cb44a bacula-1.36.3.ebuild 10122
-MD5 ba590d12d085bcba69c9ad464998a6b1 bacula-1.32f-r5.ebuild 3875
-MD5 c3a72c6f645a95f628395e3cb3d259e4 ChangeLog 7324
+MD5 5850bd0a47c8b92d9254ae0182468d72 bacula-1.36.3-r1.ebuild 5409
 MD5 329bbdebf5ff06ee0b4fdd54b6741d2b bacula-1.34.4.ebuild 4245
-MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
-MD5 c453d7375a93ff187e5bc03ede9417b8 files/digest-bacula-1.32f-r5 67
-MD5 43cfaaf0d0cd0cf963f005a524edddfa files/bacula-1.36.2-nocdrecord.patch 8874
-MD5 5ae33205251ec6fc552b97d578ae0aa7 files/digest-bacula-1.32f 65
+MD5 0ec66074f9a978d2d95797fe64ae9fc2 bacula-1.34.5.ebuild 4434
+MD5 ec5fd66209d4ce884a9ec67fba51f7cc bacula-1.34.6.ebuild 4433
+MD5 83e4f6b6f66ab9a9625f34207084c198 bacula-1.36.0.ebuild 9229
+MD5 7ab3ac8b0c5f4bcb03495c99dcbec0b0 metadata.xml 290
 MD5 28a23cdcf8c8723f3f8cb0b87d110864 files/bacula-1.36.2-cdrecord-configure.patch 635
+MD5 43cfaaf0d0cd0cf963f005a524edddfa files/bacula-1.36.2-nocdrecord.patch 8874
+MD5 8ff342665d696d0719491c33d744f294 files/bacula-1.36.3-init-depends.patch 1864
 MD5 618c837ccb4512095e8e3e274db54ce5 files/bacula-1.36.3-rescue-makefile.patch 1275
 MD5 2552434ccc44047b9b503045a9cff932 files/bacula-3.6.0-configure.diff 7578
 MD5 d12f73af10ee40c23d29afc62f9a02b2 files/bacula-init 1916
-MD5 8ff342665d696d0719491c33d744f294 files/bacula-1.36.3-init-depends.patch 1864
 MD5 9238a842a0292637c8f00243c5967527 files/bacula-init2 2574
-MD5 f444bcaac48e16af2fd6fb2e247bf8b6 files/digest-bacula-1.34.1 66
+MD5 42374b055f69dd5eb5eebe2b17542c03 files/bacula-1.36.3-cdrecord-configure.patch 616
+MD5 bbe2d2a39e5c9b172ce27d749ece635a files/bacula-conf 559
+MD5 8d33b9e89f3b819d12d1a0762442cce3 files/bacula-init3 1476
 MD5 0b9309406bd6631e14ba47c132ef3b33 files/digest-bacula-1.34.4 66
 MD5 8e55a5f04a3cd9e096e9a5dfb46f1de7 files/digest-bacula-1.34.5 66
 MD5 551003183e612a958cc974532d004224 files/digest-bacula-1.34.6 66
 MD5 aad89729d5313c52d3b3b0b9246f8f47 files/digest-bacula-1.36.0 66
 MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3 67
-MD5 13dd37747df7f32ec471e6bdf7eadec2 files/1.32f/1.32f-2-eom-nextvol.patch 9992
-MD5 aba3c0108a7b301c99c8aa4f59a04081 files/1.32f/1.32f-1-weekofmonth.patch 1879
+MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCx2KRxtZcznfol0URAmP2AKD+Zv7RCyLnSHijIIIIDGH6ktqgAwCg9Xjk
+Fer7yBCPEiNe429w9FqHlTw=
+=ErrO
+-----END PGP SIGNATURE-----
diff --git a/app-admin/bacula/bacula-1.32f-r5.ebuild b/app-admin/bacula/bacula-1.32f-r5.ebuild
deleted file mode 100644
index 489b7d157e22..000000000000
--- a/app-admin/bacula/bacula-1.32f-r5.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f-r5.ebuild,v 1.12 2005/03/15 19:49:12 ciaranm Exp $
-
-MY_P="bacula-1.32f-5"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-IUSE="readline tcpd ssl gnome mysql sqlite X static"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-DEPEND=">=sys-libs/zlib-1.1.4
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	gnome? ( gnome-base/gnome-libs )
-	sqlite? ( =dev-db/sqlite-2* )
-	mysql? ( >=dev-db/mysql-3.23 )
-	X? ( virtual/x11 )
-	virtual/mta
-	dev-libs/gmp"
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-src_compile() {
-	local myconf=""
-
-	#define this to skip building the other daemons ...
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		&& myconf="${myconf} --enable-client-only"
-
-	#might be handy to have static bins in certain situations ...
-	#use static \
-	#	&& myconf="${myconf} --enable-static-tools \
-	#	--enable-static-fd --enable-static-sd \
-	#	--enable-static-dir --enable-static-cons"
-	myconf="
-		`use_enable readline`
-		`use_enable gnome`
-		`use_enable tcpd`
-		`use_enable X x`
-		"
-	#not ./configure'able
-	#`use_enable ssl`
-
-	# mysql is the reccomended choice ...
-	if use mysql
-	then
-		myconf="${myconf} --with-mysql=/usr"
-	fi
-
-	if use sqlite
-	then
-		myconf="${myconf} --with-sqlite=/usr/include"
-	fi
-
-	if use sqlite && use mysql
-	then
-		myconf="${myconf/--with-sqlite/}"
-	fi
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lib/bacula \
-		--with-working-dir=/var/lib/bacula \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-
-	if use static
-	then
-		cd ${S}/src/filed
-		make static-baula-fd
-		cd ${S}/src/console
-		make static-console
-		cd ${S}/src/dird
-		make static-bacula-dir
-		if use gnome
-		then
-		  cd ${S}/src/gnome-console
-		  make static-gnome-console
-		fi
-		cd ${S}/src/stored
-		make static-bacula-sd
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use static
-	then
-		cd ${S}/src/filed
-		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
-		cd ${S}/src/console
-		cp static-console ${D}/usr/sbin/console
-		cd ${S}/src/dird
-		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
-		if use gnome
-		then
-			cd ${S}/src/gnome-console
-			cp static-gnome-console ${D}/usr/sbin/gnome-console
-		fi
-		cd ${S}/src/storge
-		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
-	fi
-
-	rm -rf ${D}/var #empty dir
-
-	for a in ${S}/{Changelog,CheckList,INSTALL \
-			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
-	do
-		dodoc $a
-	done
-
-	cp -a ${S}/examples ${D}/usr/share/doc/${PF}
-	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
-	dohtml -r ${S}/doc/html-manual doc/home-page
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bacula-init bacula
-}
-
-pkg_postinst() {
-	# empty dir ...
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/bacula
-	einfo
-	einfo "If this is a new install and you plan to use mysql for your"
-	einfo "catalog database, then you should now create it by doing"
-	einfo "these commands:"
-	einfo " sh /etc/bacula/grant_mysql_privileges"
-	einfo " sh /etc/bacula/create_mysql_database"
-	einfo " sh /etc/bacula/make_mysql_tables"
-	einfo
-	einfo "Then setup your configuration files in /etc/bacula and"
-	einfo "start the daemons:"
-	einfo " /etc/init.d/bacula start"
-	einfo
-	einfo "If upgrading from version 1.30 or below, please note that"
-	einfo "the database format has changed.  Please read the"
-	einfo "release notes for how to upgrade your database!!!"
-	einfo
-}
diff --git a/app-admin/bacula/bacula-1.32f.ebuild b/app-admin/bacula/bacula-1.32f.ebuild
deleted file mode 100644
index 291b57ef64b4..000000000000
--- a/app-admin/bacula/bacula-1.32f.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f.ebuild,v 1.16 2005/03/15 19:49:12 ciaranm 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="x86 ppc"
-IUSE="readline tcpd ssl gnome mysql sqlite X static"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-DEPEND=">=sys-libs/zlib-1.1.4
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	gnome? ( gnome-base/gnome-libs )
-	sqlite? ( =dev-db/sqlite-2* )
-	mysql? ( >=dev-db/mysql-3.23 )
-	X? ( virtual/x11 )
-	virtual/mta
-	dev-libs/gmp"
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	einfo "Using ${PV}-1-weekofmonth.patch"
-	epatch ${FILESDIR}/1.32f/${PV}-1-weekofmonth.patch
-
-}
-
-src_compile() {
-	local myconf=""
-
-	#define this to skip building the other daemons ...
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		&& myconf="${myconf} --enable-client-only"
-
-	#might be handy to have static bins in certain situations ...
-	myconf="
-		`use_enable readline`
-		`use_enable gnome`
-		`use_enable tcpd`
-		`use_enable X x`
-		"
-	#not ./configure'able
-	#`use_enable ssl`
-
-	# mysql is the reccomended choice ...
-	if use mysql
-	then
-		myconf="${myconf} --with-mysql=/usr"
-	fi
-
-	if use sqlite
-	then
-		myconf="${myconf} --with-sqlite=/usr"
-	fi
-
-	if use sqlite && use mysql
-	then
-		myconf="${myconf/--with-sqlite/}"
-	fi
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lib/bacula \
-		--with-working-dir=/var/lib/bacula \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-
-	if use static
-	then
-		cd ${S}/src/files
-		make static-bacula-fd
-		cd ${S}/src/console
-		make static-console
-		cd ${S}/src/dird
-		make static-bacula-dir
-		if use gnome
-		then
-		  cd ${S}/src/gnome-console
-		  make static-gnome-console
-		fi
-		cd ${S}/src/storged
-		make static-bacula-sd
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use static
-	then
-		cd ${S}/src/filed
-		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
-		rm -f ${D}/usr/sbin/static-bacula-fd
-		cd ${S}/src/console
-		cp static-console ${D}/usr/sbin/console
-		cd ${S}/src/dird
-		cp static-bacula-dir  ${D}/usr/sbin/bacula-dir
-		rm -f ${D}/usr/sbin/static-bacula-dir
-		if use gnome
-		then
-		   cd ${S}/src/gnome-console
-		   cp static-gnome-console ${D}/usr/sbin/gnome-console
-		fi
-		cd ${S}/src/storage
-		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
-		rm -f ${D}/usr/sbin/static-bacula-sd
-	fi
-
-	rm -rf ${D}/var #empty dir
-
-	dodoc ChangeLog CheckList INSTALL \
-		README ReleaseNotes kernstodo doc/bacula.pdf
-	cp -a examples ${D}/usr/share/doc/${PF}
-	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
-	dohtml -r doc/html-manual doc/home-page
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bacula-init bacula
-}
-
-pkg_postinst() {
-	# empty dir ...
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/bacula
-	einfo
-	einfo "If this is a new install and you plan to use mysql for your"
-	einfo "catalog database, then you should now create it by doing"
-	einfo "these commands:"
-	einfo " sh /etc/bacula/grant_mysql_privileges"
-	einfo " sh /etc/bacula/create_mysql_database"
-	einfo " sh /etc/bacula/make_mysql_tables"
-	einfo
-	einfo "Then setup your configuration files in /etc/bacula and"
-	einfo "start the daemons:"
-	einfo " /etc/init.d/bacula start"
-	einfo
-	einfo "If upgrading from version 1.30 or below, please note that"
-	einfo "the database format has changed.  Please read the"
-	einfo "release notes for how to upgrade your database!!!"
-	einfo
-}
diff --git a/app-admin/bacula/bacula-1.34.1.ebuild b/app-admin/bacula/bacula-1.34.1.ebuild
deleted file mode 100644
index 2ff491db8fa2..000000000000
--- a/app-admin/bacula/bacula-1.34.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.34.1.ebuild,v 1.12 2005/05/05 18:19:45 swegener Exp $
-
-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="x86 ppc sparc"
-IUSE="X gnome mysql readline sqlite ssl static tcpd"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-DEPEND=">=sys-libs/zlib-1.1.4
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	gnome? ( gnome-base/gnome-libs )
-	sqlite? ( >=dev-db/sqlite-2 )
-	mysql? ( >=dev-db/mysql-3.23 )
-	X? ( virtual/x11 )
-	virtual/mta
-	dev-libs/gmp"
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-src_compile() {
-	local myconf=""
-
-	#define this to skip building the other daemons ...
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		&& myconf="${myconf} --enable-client-only"
-
-	myconf="
-		`use_enable readline`
-		`use_enable gnome`
-		`use_enable tcpd`
-		`use_enable X x`
-		"
-	#not ./configure'able
-	#`use_enable ssl`
-
-	# mysql is the reccomended choice ...
-	if use mysql
-	then
-		myconf="${myconf} --with-mysql=/usr"
-	elif use sqlite
-	then
-		myconf="${myconf} --with-sqlite=/usr/include"
-	elif  use sqlite && use mysql
-	then
-		myconf="${myconf/--with-sqlite/}"
-	fi
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lib/bacula \
-		--with-working-dir=/var/lib/bacula \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-
-	if use static
-	then
-		cd ${S}/src/filed
-		make static-baula-fd
-		cd ${S}/src/console
-		make static-console
-		cd ${S}/src/dird
-		make static-bacula-dir
-		if use gnome
-		then
-		  cd ${S}/src/gnome-console
-		fi
-		make static-gnome-console
-		cd ${S}/src/stored
-		make static-bacula-sd
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use static
-	then
-		cd ${S}/src/filed
-		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
-		cd ${S}/src/console
-		cp static-console ${D}/usr/sbin/console
-		cd ${S}/src/dird
-		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
-		if use gnome
-		then
-			cd ${S}/src/gnome-console
-			cp static-gnome-console ${D}/usr/sbin/gnome-console
-		fi
-		cd ${S}/src/storge
-		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
-	fi
-
-	rm -rf ${D}/var #empty dir
-
-	for a in ${S}/{Changelog,CheckList,INSTALL \
-			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
-	do
-		dodoc $a
-	done
-
-	cp -a ${S}/examples ${D}/usr/share/doc/${PF}
-	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
-	dohtml -r ${S}/doc/html-manual doc/home-page
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bacula-init bacula
-}
-
-pkg_postinst() {
-	# empty dir ...
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/bacula
-	einfo
-	einfo "If this is a new install and you plan to use mysql for your"
-	einfo "catalog database, then you should now create it by doing"
-	einfo "these commands:"
-	einfo " sh /etc/bacula/grant_mysql_privileges"
-	einfo " sh /etc/bacula/create_mysql_database"
-	einfo " sh /etc/bacula/make_mysql_tables"
-	einfo
-	einfo "Then setup your configuration files in /etc/bacula and"
-	einfo "start the daemons:"
-	einfo " /etc/init.d/bacula start"
-	einfo
-	einfo "If upgrading from version 1.30 or below, please note that"
-	einfo "the database format has changed.  Please read the"
-	einfo "release notes for how to upgrade your database!!!"
-	einfo
-}
diff --git a/app-admin/bacula/bacula-1.36.3-r1.ebuild b/app-admin/bacula/bacula-1.36.3-r1.ebuild
new file mode 100644
index 000000000000..e3ad8c0d8c0d
--- /dev/null
+++ b/app-admin/bacula/bacula-1.36.3-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.36.3-r1.ebuild,v 1.1 2005/07/03 03:58:53 fserb 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? ( app-admin/gnomesu )
+	sqlite? ( =dev-db/sqlite-2* )
+	mysql? ( >=dev-db/mysql-3.23 )
+	postgres? ( >=dev-db/postgresql-7.4.0 )
+	X? ( virtual/x11 )
+	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
+		einfo "Bacula must compile with one database or client only."
+		einfo "Please add mysql, postgres, sqlite or client-only to your USE flags."
+		einfo "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
+		einfo "For this ebuild to work, only one database may be selected."
+		einfo "Please select mysql, postgres OR sqlite only on the USE flags."
+		einfo "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 || die "Patch failed"
+
+	# 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
+}
+
+src_compile() {
+	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
+
+	exeinto /etc/init.d
+	newexe ${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
+
+	insinto /etc/conf.d
+	newins ${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
+		einfo "If this is a new install, you must create the ${DB} databases with:"
+		einfo " /var/lib/bacula/create_${DB}_database"
+		einfo " /var/lib/bacula/grant_${DB}_privileges"
+		einfo " /var/lib/bacula/make_${DB}_tables"
+		einfo
+		einfo "If you're upgrading from a major release, you must upgrade your bacula database."
+		einfo "Please read the manual chapter for how to upgrade your database."
+		einfo "You can find database upgrade scripts on /var/lib/bacula."
+		einfo
+	fi
+}
\ No newline at end of file
diff --git a/app-admin/bacula/files/1.32f/1.32f-1-weekofmonth.patch b/app-admin/bacula/files/1.32f/1.32f-1-weekofmonth.patch
deleted file mode 100644
index e9cfe667655b..000000000000
--- a/app-admin/bacula/files/1.32f/1.32f-1-weekofmonth.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-
-This patch fixes an incorrect calculation of the week
-of the month reported by Volker Sauer.  It should work on either
-1.32e or 1.32f.
-       
-Apply the patch with:
-
-  cd <bacula-source>
-  patch -p0 <1.32f-weekofmonth.patch
-  make
-  ...
-
-Index: src/dird/scheduler.c
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/dird/scheduler.c,v
-retrieving revision 1.13.6.1
-diff -u -b -r1.13.6.1 scheduler.c
---- src/dird/scheduler.c	21 Dec 2003 15:17:42 -0000	1.13.6.1
-+++ src/dird/scheduler.c	6 Jan 2004 09:43:31 -0000
-@@ -205,7 +205,7 @@
-    mday = tm.tm_mday - 1;
-    wday = tm.tm_wday;
-    month = tm.tm_mon;
--   wom = tm_wom(tm.tm_mday, tm.tm_wday);  /* get week of month */
-+   wom = mday / 7;
-    woy = tm_woy(now);			  /* get week of year */
- 
-    /* Loop through all jobs */
-@@ -237,7 +237,7 @@
- 	    if (bit_is_set(next_hour, run->hour)) {
- 	       tm.tm_hour++;
- 	       if (tm.tm_hour > 23) {
--		  tm.tm_hour = 0;
-+		  continue;	      /* next day */
- 	       }
- 	       runtime = mktime(&tm);
- 	       add_job(job, run, now, runtime);
-Index: src/dird/ua_output.c
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/dird/ua_output.c,v
-retrieving revision 1.25.2.11.2.3
-diff -u -b -r1.25.2.11.2.3 ua_output.c
---- src/dird/ua_output.c	21 Dec 2003 15:17:42 -0000	1.25.2.11.2.3
-+++ src/dird/ua_output.c	6 Jan 2004 09:43:32 -0000
-@@ -454,7 +454,7 @@
-    mday = tm.tm_mday - 1;
-    wday = tm.tm_wday;
-    month = tm.tm_mon;
--   wom = tm_wom(tm.tm_mday, tm.tm_wday);
-+   wom = mday / 7;
-    woy = tm_woy(now);
- 
-    /* Break down tomorrow into components */
-@@ -463,7 +463,7 @@
-    tmday = tm.tm_mday - 1;
-    twday = tm.tm_wday;
-    tmonth = tm.tm_mon;
--   twom  = tm_wom(tm.tm_mday, tm.tm_wday);
-+   twom  = tmday / 7;
-    twoy  = tm_woy(tomorrow);
- 
-    if (run == NULL) {
diff --git a/app-admin/bacula/files/1.32f/1.32f-2-eom-nextvol.patch b/app-admin/bacula/files/1.32f/1.32f-2-eom-nextvol.patch
deleted file mode 100644
index fadee379a0a6..000000000000
--- a/app-admin/bacula/files/1.32f/1.32f-2-eom-nextvol.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-
-This patch fixes two bugs.
-1. Reported by Phil: where when the end of a Volume was reached, 
-   Bacula went into a loop requesting the next Volume then gave up.
-2. Reported by Lars: the order of the next Volume selected by Bacula
-   was not as expected.
-       
-Apply the patch with:
-
-  cd <bacula-source>
-  patch -p0 <1.32f-2-eom-nextvol.patch
-  make
-  ...
-
-Index: ReleaseNotes
-===================================================================
-RCS file: /cvsroot/bacula/bacula/ReleaseNotes,v
-retrieving revision 1.52.2.9.2.7
-retrieving revision 1.52.2.9.2.8
-diff -u -b -r1.52.2.9.2.7 -r1.52.2.9.2.8
---- ReleaseNotes	31 Dec 2003 09:10:55 -0000	1.52.2.9.2.7
-+++ ReleaseNotes	5 Jan 2004 16:49:44 -0000	1.52.2.9.2.8
-@@ -1,7 +1,14 @@
- 
--          Release Notes for Bacula 1.32f
-+          Release Notes for Bacula 1.32g
- 
-   Bacula code: Total files = 262 Total lines = 80,318 (*.h *.c *.in)
-+
-+Changes since 1.32f
-+- Fix bug reported by Phil (could not duplicate here) where at the end
-+  of a Volume, Bacula wanted a new Volume and got into a loop requesting
-+  it, then gave up.
-+- Modify selection of next Volume to select most currently appended Volume,
-+  or if none oldest recycled Volume (problem reported by Lars).
- 
- Changes since 1.32e:
- - Note, this change affects only the Win32 FD.
-Index: src/cats/sql_find.c
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/cats/sql_find.c,v
-retrieving revision 1.23.2.7.2.1
-retrieving revision 1.23.2.7.2.2
-diff -u -b -r1.23.2.7.2.1 -r1.23.2.7.2.2
---- src/cats/sql_find.c	7 Dec 2003 15:01:42 -0000	1.23.2.7.2.1
-+++ src/cats/sql_find.c	5 Jan 2004 16:49:45 -0000	1.23.2.7.2.2
-@@ -7,7 +7,7 @@
-  * 
-  *    Kern Sibbald, December 2000
-  *
-- *    Version $Id: 1.32f-2-eom-nextvol.patch,v 1.1 2004/02/03 02:06:48 zul Exp $
-+ *    Version $Id: 1.32f-2-eom-nextvol.patch,v 1.1 2004/02/03 02:06:48 zul Exp $
-  */
- 
- /*
-@@ -218,6 +218,7 @@
- {
-    SQL_ROW row;
-    int numrows;
-+   char *order;
- 
-    db_lock(mdb);
-    if (item == -1) {	   /* find oldest volume */
-@@ -232,12 +233,19 @@
-      item = 1;
-    } else {
-       /* Find next available volume */
-+      if (strcmp(mr->VolStatus, "Recycled") == 0 ||
-+          strcmp(mr->VolStatus, "Purged") == 0) {
-+         order = "ORDER BY LastWritten ASC,MediaId";  /* take oldest */
-+      } else {
-+         order = "ORDER BY LastWritten DESC,MediaId";   /* take most recently written */
-+      }  
-       Mmsg(&mdb->cmd, "SELECT MediaId,VolumeName,VolJobs,VolFiles,VolBlocks,"
--"VolBytes,VolMounts,VolErrors,VolWrites,MaxVolBytes,VolCapacityBytes,"
--"VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,Recycle,Slot,"
--"FirstWritten,LastWritten,VolStatus "
--"FROM Media WHERE PoolId=%u AND MediaType='%s' AND VolStatus='%s' "
--"ORDER BY LastWritten,MediaId", mr->PoolId, mr->MediaType, mr->VolStatus); 
-+          "VolBytes,VolMounts,VolErrors,VolWrites,MaxVolBytes,VolCapacityBytes,"
-+          "VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,Recycle,Slot,"
-+          "FirstWritten,LastWritten,VolStatus "
-+          "FROM Media WHERE PoolId=%u AND MediaType='%s' AND VolStatus='%s' "
-+          "%s LIMIT 1",
-+	  mr->PoolId, mr->MediaType, mr->VolStatus, order);
-    }
-    if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
-       db_unlock(mdb);
-Index: src/stored/mount.c
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/stored/mount.c,v
-retrieving revision 1.42.2.9.2.3
-retrieving revision 1.42.2.9.2.4
-diff -u -b -r1.42.2.9.2.3 -r1.42.2.9.2.4
---- src/stored/mount.c	8 Dec 2003 20:53:47 -0000	1.42.2.9.2.3
-+++ src/stored/mount.c	5 Jan 2004 16:49:45 -0000	1.42.2.9.2.4
-@@ -5,7 +5,7 @@
-  *
-  *   Kern Sibbald, August MMII
-  *			      
-- *   Version $Id: 1.32f-2-eom-nextvol.patch,v 1.1 2004/02/03 02:06:48 zul Exp $
-+ *   Version $Id: 1.32f-2-eom-nextvol.patch,v 1.1 2004/02/03 02:06:48 zul Exp $
-  */
- /*
-    Copyright (C) 2000-2003 Kern Sibbald and John Walker
-@@ -30,7 +30,8 @@
- #include "bacula.h"                   /* pull in global headers */
- #include "stored.h"                   /* pull in Storage Deamon headers */
- 
--/* Forward referenced functions */
-+/* Forward referenced routines */
-+static void mark_volume_in_error(JCR *jcr, DEVICE *dev);
- 
- 
- /*
-@@ -47,11 +48,17 @@
-  */
- int mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, int release)
- {
--   int retry = 0, autochanger;
--   bool ask, recycle;
-+   int retry = 0;
-+   bool ask = false, recycle, autochanger;
-+   int vol_label_status;
- 
-    Dmsg0(100, "Enter mount_next_volume()\n");
- 
-+   /* 
-+    * Attempt to mount the next volume. If something non-fatal goes
-+    *  wrong, we come back here to re-try (new op messages, re-read
-+    *  Volume, ...)
-+    */
- mount_next_vol:
-    if (retry++ > 5) {
-       Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), 
-@@ -62,8 +69,8 @@
-       Jmsg(jcr, M_FATAL, 0, _("Job %d canceled.\n"), jcr->JobId);
-       return 0;
-    }
--   autochanger = 0;
--   recycle = ask = false;
-+   autochanger = false; 	       /* Assume no autochanger */
-+   recycle = false;
-    if (release) {
-       Dmsg0(100, "mount_next_volume release=1\n");
-       release_volume(jcr, dev);
-@@ -97,15 +104,10 @@
-     * It assumes that the device is not already in use!
-     *
-     */
--
--
-    dev->state &= ~(ST_APPEND|ST_READ|ST_EOT|ST_WEOT|ST_EOF);
- 
--   for ( ;; ) {
--      int vol_label_status;
-       autochanger = autoload_device(jcr, dev, 1, NULL);
-       Dmsg1(100, "autoload_dev returns %d\n", autochanger);
--
-       /*
-        * If we autochanged to correct Volume or (we have not just
-        *   released the Volume AND we can automount) we go ahead 
-@@ -116,7 +118,7 @@
-          ask = false;                 /* don't ask SYSOP this time */
-       }
-       Dmsg2(100, "Ask=%d autochanger=%d\n", ask, autochanger);
--      release = 1;                    /* release next time if we "recurse" */
-+   release = true;                /* release next time if we "recurse" */
- 
-       if (ask && !dir_ask_sysop_to_mount_next_volume(jcr, dev)) {
-          Dmsg0(100, "Error return ask_sysop ...\n");
-@@ -181,14 +183,15 @@
- 	 /* Check if this is a valid Volume in the pool */
- 	 pm_strcpy(&jcr->VolumeName, dev->VolHdr.VolName);			   
- 	 if (!dir_get_volume_info(jcr, GET_VOL_INFO_FOR_WRITE)) {
--            Mmsg(&jcr->errmsg, _("Director wanted Volume \"%s\".\n"
-+         Jmsg(jcr, M_WARNING, 0, _("Director wanted Volume \"%s\".\n"
-                  "    Current Volume \"%s\" not acceptable because:\n"
-                  "    %s"),
- 		VolCatInfo.VolCatName, dev->VolHdr.VolName,
- 		jcr->dir_bsock->msg);
- 	    /* Restore desired volume name, note device info out of sync */
- 	    memcpy(&jcr->VolCatInfo, &VolCatInfo, sizeof(jcr->VolCatInfo));
--	    goto mount_error;
-+	 ask = true;
-+	 goto mount_next_vol;
- 	 }
-          Dmsg1(100, "want new name=%s\n", jcr->VolumeName);
- 	 memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo));
-@@ -230,15 +233,11 @@
- 	 /* NOTE! Fall-through wanted. */
-       case VOL_NO_MEDIA:
-       default:
--mount_error:
- 	 /* Send error message */
-          Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg);                         
- 	 ask = true;
--	 /* was - goto ask_again; */	     
- 	 goto mount_next_vol;
-       }
--      break;
--   }
- 
-    /* 
-     * See if we have a fresh tape or a tape with data.
-@@ -322,6 +321,10 @@
-          Jmsg(jcr, M_INFO, 0, _("Wrote label to prelabeled Volume \"%s\" on device %s\n"),
- 	    jcr->VolumeName, dev_name(dev));
-       }
-+      /*
-+       * End writing real Volume label (from pre-labeled tape), or recycling
-+       *  the volume.
-+       */
- 
-    } else {
-       /*
-@@ -335,11 +338,7 @@
-       if (!eod_dev(dev)) {
-          Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data %s. ERR=%s\n"),
- 	    dev_name(dev), strerror_dev(dev));
--         Jmsg(jcr, M_INFO, 0, _("Marking Volume \"%s\" in Error in Catalog.\n"),
--	    jcr->VolumeName);
--         bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus));
--         Dmsg0(100, "dir_update_vol_info. Set Error.\n");
--	 dir_update_volume_info(jcr, dev, 0);
-+	 mark_volume_in_error(jcr, dev);
- 	 goto mount_next_vol;
-       }
-       /* *****FIXME**** we should do some checking for files too */
-@@ -355,9 +354,7 @@
-             Jmsg(jcr, M_ERROR, 0, _("I canot write on this volume because:\n\
- The number of files mismatch! Volume=%u Catalog=%u\n"), 
- 		 dev_file(dev), dev->VolCatInfo.VolCatFiles);
--            bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus));
--            Dmsg0(100, "dir_update_vol_info. Set Error.\n");
--	    dir_update_volume_info(jcr, dev, 0);
-+	    mark_volume_in_error(jcr, dev);
- 	    goto mount_next_vol;
- 	 }
-       }
-@@ -372,7 +369,19 @@
-    return 1; 
- }
- 
-+static void mark_volume_in_error(JCR *jcr, DEVICE *dev)
-+{
-+   Jmsg(jcr, M_INFO, 0, _("Marking Volume \"%s\" in Error in Catalog.\n"),
-+	jcr->VolumeName);
-+   bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus));
-+   Dmsg0(100, "dir_update_vol_info. Set Error.\n");
-+   dir_update_volume_info(jcr, dev, 0);
-+}
- 
-+/* 
-+ * If we are reading, we come here at the end of the tape
-+ *  and see if there are more volumes to be mounted.
-+ */
- int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
- {
-    Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume);
-@@ -399,7 +408,6 @@
-  */
- void release_volume(JCR *jcr, DEVICE *dev)
- {
--
-    if (jcr->WroteVol) {
-       Jmsg0(jcr, M_ERROR, 0, "Hey!!!!! WroteVol non-zero !!!!!\n");
-    }
-@@ -411,7 +419,8 @@
-    memset(&dev->VolCatInfo, 0, sizeof(dev->VolCatInfo));
-    memset(&jcr->VolCatInfo, 0, sizeof(jcr->VolCatInfo));
-    memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
--   dev->state &= ~ST_LABEL;	   /* label not yet read */
-+   /* Force re-read of label */
-+   dev->state &= ~(ST_LABEL|ST_READ|ST_APPEND);
-    jcr->VolumeName[0] = 0;
- 
-    if ((dev->state & ST_OPENED) && 
diff --git a/app-admin/bacula/files/bacula-1.36.3-cdrecord-configure.patch b/app-admin/bacula/files/bacula-1.36.3-cdrecord-configure.patch
new file mode 100644
index 000000000000..6fa8511484e3
--- /dev/null
+++ b/app-admin/bacula/files/bacula-1.36.3-cdrecord-configure.patch
@@ -0,0 +1,19 @@
+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-admin/bacula/files/bacula-conf b/app-admin/bacula/files/bacula-conf
new file mode 100644
index 000000000000..caa9022ad8db
--- /dev/null
+++ b/app-admin/bacula/files/bacula-conf
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/files/bacula-conf,v 1.1 2005/07/03 03:58:53 fserb 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-admin/bacula/files/bacula-init3 b/app-admin/bacula/files/bacula-init3
new file mode 100644
index 000000000000..facb9668cbb3
--- /dev/null
+++ b/app-admin/bacula/files/bacula-init3
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/files/bacula-init3,v 1.1 2005/07/03 03:58:53 fserb 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-admin/bacula/files/digest-bacula-1.32f b/app-admin/bacula/files/digest-bacula-1.32f
deleted file mode 100644
index 9a79ae6be31f..000000000000
--- a/app-admin/bacula/files/digest-bacula-1.32f
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c635cf693262fc946eb13aa271e0263 bacula-1.32f.tar.gz 3291702
diff --git a/app-admin/bacula/files/digest-bacula-1.32f-r5 b/app-admin/bacula/files/digest-bacula-1.32f-r5
deleted file mode 100644
index 617210741709..000000000000
--- a/app-admin/bacula/files/digest-bacula-1.32f-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20fe32f7849723c8717ba59121eb6f99 bacula-1.32f-5.tar.gz 3337763
diff --git a/app-admin/bacula/files/digest-bacula-1.34.1 b/app-admin/bacula/files/digest-bacula-1.34.1
deleted file mode 100644
index 4cdfe99f0082..000000000000
--- a/app-admin/bacula/files/digest-bacula-1.34.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d78fa49fad4ac1d369f97910084279f9 bacula-1.34.1.tar.gz 4413536
diff --git a/app-admin/bacula/files/digest-bacula-1.36.3-r1 b/app-admin/bacula/files/digest-bacula-1.36.3-r1
new file mode 100644
index 000000000000..e744487479d1
--- /dev/null
+++ b/app-admin/bacula/files/digest-bacula-1.36.3-r1
@@ -0,0 +1 @@
+MD5 9499d6277b8673ae7c24dcdbf89ee026 bacula-1.36.3.tar.gz 11153154
diff --git a/app-admin/bacula/metadata.xml b/app-admin/bacula/metadata.xml
index d66bb0cd26df..d4e64fa57ca2 100644
--- a/app-admin/bacula/metadata.xml
+++ b/app-admin/bacula/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>zul@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>fserb@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>hadfield@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>