version bump and cleanups, ebuilds courtesy of bug #74953, thanks to barningerATfairfieldcomputers.com

(Portage version: 2.0.51.22-r1)

7 files changed, 586 insertions, 1 deletions

diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index c9efe1ed0d75..4af7fba994b3 100644
--- a/app-admin/bacula/ChangeLog
+++ b/app-admin/bacula/ChangeLog
@@ -1,6 +1,16 @@
 # 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.48 2005/05/05 18:19:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.49 2005/07/01 11:59:04 iggy Exp $
+
+*bacula-1.36.3 (01 Jul 2005)
+
+  01 Jul 2005; Brian Jackson <iggy@gentoo.org>
+  +files/bacula-1.36.2-cdrecord-configure.patch,
+  +files/bacula-1.36.2-nocdrecord.patch,
+  +files/bacula-1.36.3-init-depends.patch,
+  +files/bacula-1.36.3-rescue-makefile.patch, +bacula-1.36.3.ebuild:
+  version bump and cleanups, ebuilds courtesy of bug #74953, thanks to
+  barningerATfairfieldcomputers.com
 
   05 May 2005; Sven Wegener <swegener@gentoo.org> bacula-1.34.1.ebuild:
   Fixed [<>]=cat/pkg-ver* dependencies.
diff --git a/app-admin/bacula/bacula-1.36.3.ebuild b/app-admin/bacula/bacula-1.36.3.ebuild
new file mode 100644
index 000000000000..fda20b430436
--- /dev/null
+++ b/app-admin/bacula/bacula-1.36.3.ebuild
@@ -0,0 +1,327 @@
+# 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.ebuild,v 1.1 2005/07/01 11:59:04 iggy 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="~ppc ~sparc ~x86"
+IUSE="bacula-clientonly bacula-console bacula-split doc gnome logrotate logwatch mysql postgres readline sqlite static tcpd wxwindows X"
+
+#theres a local sqlite use flag. use it -OR- mysql, not both.
+#mysql is the reccomended choice ...
+#may need sys-libs/libtermcap-compat but try without first
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	dev-libs/gmp
+	!bacula-clientonly? (
+		mysql? ( >=dev-db/mysql-3.23 )
+		postgres? ( >=dev-db/postgresql-7.4.0 )
+		sqlite? ( =dev-db/sqlite-2* )
+		!mysql? ( !postgres? ( !sqlite? ( >=dev-db/mysql-3.23 ) ) )
+		virtual/mta
+	)
+	bacula-console? (
+		X? ( virtual/x11 )
+		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
+		gnome? ( gnome-base/libgnome )
+		gnome? ( app-admin/gnomesu )
+	)
+	doc? (
+		app-text/tetex
+		dev-tex/latex2html
+	)
+	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() {
+	if ( use mysql || use postgres ) && [ -z ${BACULA_DB_USER} ] && [ -z ${BACULA_DB_PASSWORD} ] && [ -z ${BACULA_DB_HOST} ]; then
+		# Display warning about DB query environment variables
+		einfo
+		einfo "If you are upgrading or rebuilding your bacula installation and"
+		einfo "your database requires you to specify user, password, or host"
+		einfo "you may do so with the environment variables BACULA_DB_USER,"
+		einfo "BACULA_DB_PASSWORD, and BACULA_DB_HOST respectively."
+		einfo
+		einfo "For example:"
+		einfo "# export BACULA_DB_USER=\"bacula\""
+		einfo "# export BACULA_DB_PASSWORD=\"mydbpassword\""
+		einfo "# export BACULA_DB_HOST=\"mydbhost.mydomain.net\""
+		einfo "# emerge bacula"
+		einfo
+		einfo "If you require these variables and have not set them yet, you"
+		einfo "may wish to abort now and do so.  If this is a new installation"
+		einfo "of bacula, this should not affect you."
+		einfo
+
+		ebeep 3
+		ewarn "Press Ctrl-C to abort.  Merge will resume in 10 seconds."
+		epause 10
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	# this resolves bacula bug #181
+	epatch ${FILESDIR}/${PN}-1.36.2-cdrecord-configure.patch
+	# fixes lack of depend() in split init scripts
+	epatch ${FILESDIR}/${PN}-1.36.3-init-depends.patch
+	# adds build/install capability to ${S}/rescue/linux/Makefile.in
+	epatch ${FILESDIR}/${PN}-1.36.3-rescue-makefile.patch
+	cd ${S}
+}
+
+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_enable X x`
+			`use_enable gnome tray-monitor`
+			`use_enable wxwindows wx-console`
+			`use_enable static static-cons`"
+	fi
+	myconf="${myconf}
+		`use_enable readline`
+		`use_enable tcpd tcp-wrappers`"
+
+	# select database support
+	if ! use bacula-clientonly; then
+		if ! use mysql && ! use postgres && ! use sqlite ; then
+			ewarn "No database enabled in USE."
+			ewarn "Using mysql database support by default."
+			myconf="${myconf}
+				`use_with mysql`"
+		elif use mysql ; then
+			if use postgres ; then
+				ewarn "Multiple databases enabled in USE."
+				ewarn "Using mysql database support by default."
+			elif use sqlite ; then
+				ewarn "Multiple databases enabled in USE."
+				ewarn "Using mysql database support by default."
+			fi
+			myconf="${myconf}
+				`use_with mysql`"
+		elif use postgres ; then
+			if use sqlite ; then
+				ewarn "Multiple databases enabled in USE."
+				ewarn "Using postgresql database support by default."
+			fi
+			myconf="${myconf}
+				`use_with postgres postgresql`"
+		else
+			myconf="${myconf}
+				`use_with sqlite`"
+		fi
+	fi
+	if ! use bacula-clientonly; then
+		if use static ; then
+			myconf="${myconf}
+				`use_enable static static-tools`
+				`use_enable static static-fd`
+				`use_enable static static-sd`
+				`use_enable static static-dir`"
+		fi
+	fi
+
+	./configure \
+		--prefix=/usr \
+		--enable-smartalloc \
+		--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/bacula \
+		--with-scriptdir=/etc/bacula \
+		--with-dir-user=root \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--host=${CHOST} ${myconf} || die "Configure failed!"
+
+	emake || die "Failed primary build!"
+
+	if use doc ; then
+		# make the docs
+		cd ${S}/doc/latex && emake || die "Failed to build tetx docs!" && cd ${S}
+	fi
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "Failed install to ${D} !"
+
+	if use gnome ; then
+		dodir /usr/bin
+		emake DESTDIR=${D} \
+			install-menu \
+			install-menu-xsu \
+			install-menu-consolehelper || die "Failed to install gnome menu files to ${D} !"
+
+		#chmod 755 ${D}/usr/sbin/bacula-tray-monitor
+		#chmod 644 ${D}/etc/bacula/tray-monitor.conf
+	fi
+	if ! use bacula-clientonly ; then
+		# the database update scripts
+		mkdir -p ${D}/etc/bacula/updatedb
+		cp ${S}/updatedb/* ${D}/etc/bacula/updatedb/
+		chmod 754 ${D}/etc/bacula/updatedb/*
+
+		# the logrotate configuration
+		if use logrotate ; then
+			mkdir -p ${D}/etc/logrotate.d
+			cp ${S}/scripts/logrotate ${D}/etc/logrotate.d/bacula
+			chmod 644 ${D}/etc/logrotate.d/bacula
+		fi
+
+		# the logwatch scripts
+		if use logwatch ; then
+			cd ${S}/scripts/logwatch
+			emake DESTDIR=${D} install || die "Failed to install logwatch scripts to ${D} !"
+			cd ${S}
+		fi
+	fi
+	# documentation
+	for a in ${S}/{Changelog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
+	do
+		dodoc ${a}
+	done
+	# clean up permissions left broken by install
+	chown -R root:root ${D}/usr/share/doc/${PF}
+	chmod -R 644 ${D}/usr/share/doc/${PF}/*
+	chmod o-r ${D}/etc/bacula/query.sql
+	# remove the working dir so we can add it postinst with group
+	rmdir ${D}/var/bacula
+
+	exeinto ${S}/etc/init.d
+	if use bacula-clientonly ; then
+		newexe ${S}/platforms/gentoo/bacula-fd bacula-fd
+	else
+		if use bacula-split ; then
+			newexe ${S}/platforms/gentoo/bacula-fd bacula-fd
+			newexe ${S}/platforms/gentoo/bacula-sd bacula-sd
+			newexe ${S}/platforms/gentoo/bacula-dir bacula-dir
+		else
+			newexe ${S}/platforms/gentoo/bacula-init bacula
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# create the daemon group
+	HAVE_BACULA=`cat /etc/group | grep bacula 2>/dev/null`
+	if [ -z ${HAVE_BACULA} ]; then
+		enewgroup bacula
+		einfo "The group bacula has been created. Any users you add to"
+		einfo "this group have access to files created by the daemons."
+		# the working directory
+		install -m0750 -o root -g bacula -d ${ROOT}/var/bacula
+	fi
+
+	einfo
+	einfo "The CD-ROM rescue disk package has been installed into the"
+	einfo "/etc/bacula/rescue/cdrom/ directory. Please examine the manual"
+	einfo "for information on creating a rescue CD."
+	einfo
+
+	if ! use bacula-clientonly ; then
+		# test for an existing database
+		if use mysql ; then
+			mydb="mysql"
+		elif use postgres ; then
+			mydb="postgresql"
+		elif use sqlite ; then
+			mydb="sqlite"
+		else
+			mydb="mysql"
+		fi
+
+		if [ ${mydb} == "sqlite" ]; then
+			DB_VER=`echo "select * from Version;" | sqlite /var/bacula/bacula.db | tail -n 1 2>/dev/null`
+		else
+			if [ -z ${BACULA_DB_USER} ] && [ -z ${BACULA_DB_PASSWORD} ] && [ -z ${BACULA_DB_HOST} ]; then
+				if [ ${mydb} == "mysql" ]; then
+					DB_VER=`mysql bacula -e 'select * from Version;' | tail -n 1 2>/dev/null`
+				elif [ ${mydb} == "postgresql" ]; then
+					DB_VER=`echo 'select * from Version;' | psql bacula | tail -3 | head -n 1 2>/dev/null`
+				fi
+			else
+				BACULA_DB_OPTS=""
+				if [ ${mydb} == "mysql" ]; then
+					if [ ! -z ${BACULA_DB_HOST} ]; then
+						BACULA_DB_OPTS="${BACULA_DB_OPTS} --host=${BACULA_DB_HOST}"
+					fi
+					if [ ! -z ${BACULA_DB_USER} ]; then
+						BACULA_DB_OPTS="${BACULA_DB_OPTS} --user=${BACULA_DB_USER}"
+					fi
+					if [ ! -z ${BACULA_DB_PASSWORD} ]; then
+						BACULA_DB_OPTS="${BACULA_DB_OPTS} --password=${BACULA_DB_PASSWORD}"
+					fi
+					DB_VER=`mysql ${BACULA_DB_OPTS} -e 'select * from Version' bacula | tail -n 1 2>/dev/null`
+				elif [ ${mydb} == "postgresql" ]; then
+					if [ ! -z ${BACULA_DB_HOST} ]; then
+						BACULA_DB_OPTS="${BACULA_DB_OPTS} --host ${BACULA_DB_HOST}"
+					fi
+					if [ ! -z ${BACULA_DB_USER} ]; then
+						BACULA_DB_OPTS="${BACULA_DB_OPTS} --username ${BACULA_DB_USER}"
+					fi
+					# psql prompts for password by default but we can force it.
+					# psql(1) does not seem to support --password=somepass
+					# NOTE: this is untested
+					if [ ! -z ${BACULA_DB_PASSWORD} ]; then
+						BACULA_DB_OPTS="${BACULA_DB_OPTS} --password"
+					fi
+					DB_VER=`echo 'select * from Version;' | psql ${BACULA_DB_OPTS} bacula | tail -3 | head -n 1 2>/dev/null`
+				fi
+			fi
+		fi
+		if [ -z "${DB_VER}" ]; then
+			einfo "This appears to be a new install and you plan to use ${mydb}"
+			einfo "for your catalog database. You should now create it with the"
+			einfo "following commands:"
+			einfo " sh /etc/bacula/grant_${mydb}_privileges"
+			einfo " sh /etc/bacula/create_${mydb}_database"
+			einfo " sh /etc/bacula/make_${mydb}_tables"
+		elif [ "${DB_VER}" -lt "8" ]; then
+			einfo "This release requires an upgrade to your bacula database"
+			einfo "as the database format has changed.  Please read the"
+			einfo "manual chapter for upgrading your database!"
+		fi
+	fi
+
+	einfo
+	einfo "Configuration files are installed in /etc/bacula and"
+	einfo "init script(s) are:"
+	if use bacula-clientonly ; then
+		einfo " /etc/init.d/bacula-fd"
+	else
+		if use bacula-split ; then
+			einfo " /etc/init.d/bacula-sd"
+			einfo " /etc/init.d/bacula-dir"
+			einfo " /etc/init.d/bacula-fd"
+			einfo " or /etc/bacula/bacula will start all three."
+		else
+			einfo " /etc/init.d/bacula"
+		fi
+	fi
+	einfo
+}
diff --git a/app-admin/bacula/files/bacula-1.36.2-cdrecord-configure.patch b/app-admin/bacula/files/bacula-1.36.2-cdrecord-configure.patch
new file mode 100644
index 000000000000..bd29540cb40a
--- /dev/null
+++ b/app-admin/bacula/files/bacula-1.36.2-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-1.36.2-nocdrecord.patch b/app-admin/bacula/files/bacula-1.36.2-nocdrecord.patch
new file mode 100644
index 000000000000..95842c1955d3
--- /dev/null
+++ b/app-admin/bacula/files/bacula-1.36.2-nocdrecord.patch
@@ -0,0 +1,125 @@
+diff -uNr bacula-1.36.2-original/autoconf/configure.in bacula-1.36.2-nocdrecord/autoconf/configure.in
+--- bacula-1.36.2-original/autoconf/configure.in	2005-02-25 04:47:03.000000000 -0500
++++ bacula-1.36.2-nocdrecord/autoconf/configure.in	2005-03-05 23:46:28.000000000 -0500
+@@ -63,7 +63,6 @@
+ AC_PATH_PROG(MTX, mtx, mtx)
+ AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
+ AC_PATH_PROG(WXCONFIG, wx-config, wx-config)
+-AC_PATH_PROG(CDRECORD, cdrecord, cdrecord)
+ AC_PATH_PROG(PIDOF, pidof, pidof)
+ AC_PROG_AWK
+ # Some AWK programs fail, so test it and warn the user
+@@ -521,23 +520,6 @@
+ # End of readline/conio stuff
+ # -----------------------------------------------------------------------
+ 
+-# -------------------------------------------
+-# check for cdrecord writer location
+-# 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
+-AC_SUBST(CDSTL)
+-
+-
+ # ---------------------------------------------------
+ # Check for GMP support/directory
+ # ---------------------------------------------------
+diff -uNr bacula-1.36.2-original/configure bacula-1.36.2-nocdrecord/configure
+--- bacula-1.36.2-original/configure	2005-02-25 04:46:49.000000000 -0500
++++ bacula-1.36.2-nocdrecord/configure	2005-03-05 23:42:12.000000000 -0500
+@@ -309,7 +309,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC CDSTL working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC CDSTL working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
+ ac_subst_files='MCOMMON'
+ 
+ # Initialize some variables set by options.
+@@ -3830,46 +3830,6 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-# Extract the first word of "cdrecord", so it can be a program name with args.
+-set dummy cdrecord; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_CDRECORD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $CDRECORD in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_CDRECORD="$CDRECORD" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_CDRECORD="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_path_CDRECORD" && ac_cv_path_CDRECORD="cdrecord"
+-  ;;
+-esac
+-fi
+-CDRECORD=$ac_cv_path_CDRECORD
+-
+-if test -n "$CDRECORD"; then
+-  echo "$as_me:$LINENO: result: $CDRECORD" >&5
+-echo "${ECHO_T}$CDRECORD" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+ # Extract the first word of "pidof", so it can be a program name with args.
+ set dummy pidof; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -7296,22 +7256,6 @@
+ # End of readline/conio stuff
+ # -----------------------------------------------------------------------
+ 
+-# -------------------------------------------
+-# check for cdrecord writer location
+-# 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
+-
+-
+ 
+ # ---------------------------------------------------
+ # Check for GMP support/directory
+@@ -21984,7 +21928,6 @@
+ s,@MTX@,$MTX,;t t
+ s,@PKGCONFIG@,$PKGCONFIG,;t t
+ s,@WXCONFIG@,$WXCONFIG,;t t
+-s,@CDRECORD@,$CDRECORD,;t t
+ s,@PIDOF@,$PIDOF,;t t
+ s,@AWK@,$AWK,;t t
+ s,@ARFLAGS@,$ARFLAGS,;t t
diff --git a/app-admin/bacula/files/bacula-1.36.3-init-depends.patch b/app-admin/bacula/files/bacula-1.36.3-init-depends.patch
new file mode 100644
index 000000000000..95f01ef830ee
--- /dev/null
+++ b/app-admin/bacula/files/bacula-1.36.3-init-depends.patch
@@ -0,0 +1,57 @@
+diff -uNr platforms/gentoo/bacula-dir.in platforms/gentoo-fixed/bacula-dir.in
+--- platforms/gentoo/bacula-dir.in	2004-10-19 08:35:07.000000000 -0500
++++ platforms/gentoo-fixed/bacula-dir.in	2005-06-08 09:58:21.000000000 -0500
+@@ -9,6 +9,11 @@
+ #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+ 
++depend() {
++	need net
++	use dns @DB_NAME@
++}
++
+ start() {
+        ebegin "Starting the Bacula Director"
+        start-stop-daemon --start --quiet --exec @sbindir@/bacula-dir -- $2 -c @sysconfdir@/bacula-dir.conf
+diff -uNr platforms/gentoo/bacula-fd.in platforms/gentoo-fixed/bacula-fd.in
+--- platforms/gentoo/bacula-fd.in	2004-10-19 08:35:07.000000000 -0500
++++ platforms/gentoo-fixed/bacula-fd.in	2005-06-08 09:58:56.000000000 -0500
+@@ -9,6 +9,11 @@
+ #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+ 
++depend() {
++	need net
++	use dns
++}
++
+ start() {
+        ebegin "Starting the Bacula File daemon"
+        start-stop-daemon --start --quiet --exec @sbindir@/bacula-fd -- $2 -c @sysconfdir@/bacula-fd.conf
+diff -uNr platforms/gentoo/bacula-init.in platforms/gentoo-fixed/bacula-init.in
+--- platforms/gentoo/bacula-init.in	2004-10-24 08:58:25.000000000 -0500
++++ platforms/gentoo-fixed/bacula-init.in	2005-06-08 09:54:23.000000000 -0500
+@@ -6,7 +6,7 @@
+ 
+ depend() {
+ 	need net
+-	use @DB_NAME@
++	use dns @DB_NAME@
+ }
+ 
+ opts="test"
+diff -uNr platforms/gentoo/bacula-sd.in platforms/gentoo-fixed/bacula-sd.in
+--- platforms/gentoo/bacula-sd.in	2004-10-19 08:35:07.000000000 -0500
++++ platforms/gentoo-fixed/bacula-sd.in	2005-06-08 10:00:33.000000000 -0500
+@@ -9,6 +9,11 @@
+ #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+ 
++depend() {
++	need net
++	use dns @DB_NAME@
++}
++
+ start() {
+        ebegin "Starting the Bacula Storage daemon"
+        start-stop-daemon --start --quiet --exec  @sbindir@/bacula-sd -- $2 -c @sysconfdir@/bacula-sd.conf
diff --git a/app-admin/bacula/files/bacula-1.36.3-rescue-makefile.patch b/app-admin/bacula/files/bacula-1.36.3-rescue-makefile.patch
new file mode 100644
index 000000000000..0c5d975019ee
--- /dev/null
+++ b/app-admin/bacula/files/bacula-1.36.3-rescue-makefile.patch
@@ -0,0 +1,46 @@
+--- rescue/linux/Makefile.in	2004-08-31 16:05:50.000000000 -0500
++++ rescue/linux-fixed/Makefile.in	2005-06-20 08:07:50.000000000 -0500
+@@ -1,12 +1,41 @@
+-
+-all:
++topdir = @BUILD_DIR@
++thisdir = $(topdir)/rescue/linux
++sysconfdir = @sysconfdir@
++
++MKDIR = $(topdir)/autoconf/mkinstalldirs
++CP = @CP@
++RM = @RM@
++RMF = "$(RM) -f"
++
++all: Makefile
++	(cd $(topdir)/src/filed; \
++	$(MAKE) static-bacula-fd; \
++	cd $(thisdir))
+ 
+ install:
++	$(MKDIR) -m 750 $(DESTDIR)$(sysconfdir)/rescue/cdrom;
++	$(CP) -R $(thisdir)/cdrom/* \
++		$(DESTDIR)$(sysconfdir)/rescue/cdrom/
++	$(MKDIR) -m 750 $(DESTDIR)$(sysconfdir)/rescue/cdrom/bin
++	$(CP) -R $(topdir)/src/filed/static-bacula-fd \
++		$(DESTDIR)$(sysconfdir)/rescue/cdrom/bin/bacula-fd
++	$(MKDIR) $(DESTDIR)$(sysconfdir)/rescue/floppy
++	$(CP) -R $(thisdir)/floppy/* \
++		$(DESTDIR)$(sysconfdir)/rescue/floppy/
++	$(CP) -R $(topdir)/src/filed/static-bacula-fd \
++		$(DESTDIR)$(sysconfdir)/rescue/floppy/bacula-fd
++	chmod 754 $(DESTDIR)$(sysconfdir)/rescue/cdrom/bin/bacula-fd \
++		$(DESTDIR)$(sysconfdir)/rescue/floppy/bacula-fd
+ 
+ uninstall:
++	$(RMF) -r $(DESTDIR)$(sysconfdir)/rescue
+ 
+ clean:
+ 
+ distclean:
+ 
+ depend:
++
++Makefile: Makefile.in
++	cd $(topdir) \
++		&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/app-admin/bacula/files/digest-bacula-1.36.3 b/app-admin/bacula/files/digest-bacula-1.36.3
new file mode 100644
index 000000000000..e744487479d1
--- /dev/null
+++ b/app-admin/bacula/files/digest-bacula-1.36.3
@@ -0,0 +1 @@
+MD5 9499d6277b8673ae7c24dcdbf89ee026 bacula-1.36.3.tar.gz 11153154