Version bumped.

4 files changed, 189 insertions, 9 deletions

diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index 77daaf68dd07..294060b5a6b5 100644
--- a/app-admin/bacula/ChangeLog
+++ b/app-admin/bacula/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/bacula
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.41 2004/10/17 13:34:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.42 2004/11/27 13:39:35 mholzer Exp $
+
+*bacula-1.34.6 (27 Nov 2004)
+
+  27 Nov 2004; Martin Holzer <mholzer@gentoo.org> +bacula-1.34.6.ebuild:
+  Version bumped.
 
   17 Oct 2004; Jason Wever <weeve@gentoo.org> bacula-1.34.4.ebuild:
   Stable on sparc.
diff --git a/app-admin/bacula/Manifest b/app-admin/bacula/Manifest
index 298cded1e930..c0d203c0283e 100644
--- a/app-admin/bacula/Manifest
+++ b/app-admin/bacula/Manifest
@@ -1,15 +1,17 @@
+MD5 b7afa1ce2b52c103bd93d453a636cb45 bacula-1.34.1.ebuild 3602
+MD5 688745cdf10527823bdd0c2b71a6e33a bacula-1.32f.ebuild 3862
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 86a94177d19b5e67aea59d73a89d64b7 bacula-1.34.4.ebuild 4242
 MD5 581438070a1d3019454668b96fd00816 ChangeLog 5914
 MD5 b006aa694189a2ed5b8c66696c0c8166 bacula-1.34.5.ebuild 4431
-MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
-MD5 688745cdf10527823bdd0c2b71a6e33a bacula-1.32f.ebuild 3862
 MD5 90bb2459c037add7da9680e2d858a64c bacula-1.32f-r5.ebuild 3844
-MD5 b7afa1ce2b52c103bd93d453a636cb45 bacula-1.34.1.ebuild 3602
-MD5 86a94177d19b5e67aea59d73a89d64b7 bacula-1.34.4.ebuild 4242
-MD5 d12f73af10ee40c23d29afc62f9a02b2 files/bacula-init 1916
-MD5 8e55a5f04a3cd9e096e9a5dfb46f1de7 files/digest-bacula-1.34.5 66
-MD5 5ae33205251ec6fc552b97d578ae0aa7 files/digest-bacula-1.32f 65
+MD5 b006aa694189a2ed5b8c66696c0c8166 bacula-1.34.6.ebuild 4431
 MD5 c453d7375a93ff187e5bc03ede9417b8 files/digest-bacula-1.32f-r5 67
 MD5 f444bcaac48e16af2fd6fb2e247bf8b6 files/digest-bacula-1.34.1 66
+MD5 5ae33205251ec6fc552b97d578ae0aa7 files/digest-bacula-1.32f 65
 MD5 0b9309406bd6631e14ba47c132ef3b33 files/digest-bacula-1.34.4 66
-MD5 aba3c0108a7b301c99c8aa4f59a04081 files/1.32f/1.32f-1-weekofmonth.patch 1879
+MD5 8e55a5f04a3cd9e096e9a5dfb46f1de7 files/digest-bacula-1.34.5 66
+MD5 d12f73af10ee40c23d29afc62f9a02b2 files/bacula-init 1916
+MD5 551003183e612a958cc974532d004224 files/digest-bacula-1.34.6 66
 MD5 13dd37747df7f32ec471e6bdf7eadec2 files/1.32f/1.32f-2-eom-nextvol.patch 9992
+MD5 aba3c0108a7b301c99c8aa4f59a04081 files/1.32f/1.32f-1-weekofmonth.patch 1879
diff --git a/app-admin/bacula/bacula-1.34.6.ebuild b/app-admin/bacula/bacula-1.34.6.ebuild
new file mode 100644
index 000000000000..b785f3fe3b9b
--- /dev/null
+++ b/app-admin/bacula/bacula-1.34.6.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.34.6.ebuild,v 1.1 2004/11/27 13:39:35 mholzer 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="~hppa ~ppc ~sparc ~x86"
+IUSE="readline tcpd gnome mysql sqlite X static postgres wxwindows"
+
+#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 )
+	gnome? ( gnome-base/gnome-libs )
+	sqlite? ( =dev-db/sqlite-2* )
+	mysql? ( >=dev-db/mysql-3.23 )
+	postgres? ( >=dev-db/postgresql-7.4.0 )
+	X? ( virtual/x11 )
+	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
+	virtual/mta
+	dev-libs/gmp"
+RDEPEND="${DEPEND}
+	sys-apps/mtx
+	app-arch/mt-st"
+
+src_compile() {
+	local myconf=""
+
+	sed -i -e "s:$bindir/mysql:$bindir/mysql -p:g" grant_mysql_privileges.in
+
+	#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 tcp-wrappers`
+		`use_enable X x`"
+
+	[ -n "$BUILD_CLIENT_ONLY" ] \
+		 && myconf="${myconf} --enable-client-only"
+
+	# mysql is the reccomended choice ...
+	if use mysql
+	then
+		myconf="${myconf} --with-mysql=/usr"
+	elif use postgres
+	then
+		myconf="${myconf} --with-postgresql=/usr"
+	elif use sqlite
+	then
+		myconf="${myconf} --with-sqlite=/usr"
+	elif  use sqlite && use mysql
+	then
+		myconf="${myconf/--with-sqlite/}"
+	fi
+
+	if use wxwindows
+	then
+	   myconf="${myconf} --enable-wx-console"
+	 fi
+
+
+	./configure \
+		--enable-smartalloc \
+		--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
+		if use wxwindows
+		then
+		  cd ${S}/src/wx-console
+		  make static-wx-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
+		if use wxwindows
+		then
+			cd ${S}/src/wx-console
+			cp static-wx-console ${D}/usr/sbin/wx-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 "Please note either/or nature of database USE flags for"
+	einfo "Bacula.  If mysql is set, it will be used, else postgresql"
+	einfo "else finally SQLite.  If you wish to have multiple DBs on"
+	einfo "one system, you may wish to unset auxillary DBs for this"
+	einfo "build."
+	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/files/digest-bacula-1.34.6 b/app-admin/bacula/files/digest-bacula-1.34.6
new file mode 100644
index 000000000000..016a6388a4d0
--- /dev/null
+++ b/app-admin/bacula/files/digest-bacula-1.34.6
@@ -0,0 +1 @@
+MD5 9de593cb206df126a8e27774281c5bf6 bacula-1.34.6.tar.gz 4633962