Bumped stable (13.2.4), added beta ebuild (14.2.1), removed old version.

Fixes #528800.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

4 files changed, 42 insertions, 14 deletions

diff --git a/app-backup/bareos/ChangeLog b/app-backup/bareos/ChangeLog
index c7dcd5e71211..762c53596556 100644
--- a/app-backup/bareos/ChangeLog
+++ b/app-backup/bareos/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-backup/bareos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v 1.12 2014/11/03 11:05:51 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v 1.13 2014/11/19 00:38:54 mschiff Exp $
+
+*bareos-14.2.1 (19 Nov 2014)
+*bareos-13.2.4 (19 Nov 2014)
+
+  19 Nov 2014; Marc Schiffbauer <mschiff@gentoo.org> -bareos-13.2.2.ebuild,
+  -bareos-13.2.3.ebuild, +bareos-13.2.4.ebuild, +bareos-14.2.1.ebuild,
+  metadata.xml:
+  Bumped stable (13.2.4), added beta ebuild (14.2.1), removed old version.
+  Fixes #528800.
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
   bareos-12.4.5-r1.ebuild, bareos-13.2.2.ebuild, bareos-13.2.3.ebuild,
diff --git a/app-backup/bareos/bareos-13.2.2.ebuild b/app-backup/bareos/bareos-13.2.4.ebuild
index e87aa63497fb..8816ebc39431 100644
--- a/app-backup/bareos/bareos-13.2.2.ebuild
+++ b/app-backup/bareos/bareos-13.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.2.ebuild,v 1.5 2014/11/03 11:05:51 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.4.ebuild,v 1.1 2014/11/19 00:38:54 mschiff Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director ipv6 logwatch mysql ndmp postgres python qt4
+IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python qt4
 		readline scsi-crypto sql-pooling +sqlite3 ssl static +storage-daemon tcpd
 		vim-syntax X"
 
@@ -34,6 +34,7 @@ DEPEND="
 		dev-qt/qtsvg:4
 		x11-libs/qwt:5
 	)
+	fastlz? ( dev-libs/bareos-fastlzlib )
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( sys-apps/tcp-wrappers )
 	readline? ( sys-libs/readline )
@@ -46,10 +47,10 @@ DEPEND="
 	)
 	!static? (
 		acl? ( virtual/acl )
-		sys-libs/zlib
 		dev-libs/lzo
-		sys-libs/ncurses
 		ssl? ( dev-libs/openssl )
+		sys-libs/ncurses
+		sys-libs/zlib
 	)
 	python? ( ${PYTHON_DEPS} )
 	"
@@ -155,6 +156,7 @@ src_configure() {
 		$(use_enable !readline conio) \
 		$(use_enable scsi-crypto) \
 		$(use_enable sql-pooling) \
+		$(use_with fastlz) \
 		$(use_with mysql) \
 		$(use_with postgres postgresql) \
 		$(use_with python) \
diff --git a/app-backup/bareos/bareos-13.2.3.ebuild b/app-backup/bareos/bareos-14.2.1.ebuild
index c30696a92218..801048d6bd23 100644
--- a/app-backup/bareos/bareos-13.2.3.ebuild
+++ b/app-backup/bareos/bareos-14.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.3.ebuild,v 1.2 2014/11/03 11:05:51 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-14.2.1.ebuild,v 1.1 2014/11/19 00:38:54 mschiff Exp $
 
 EAPI="5"
 
@@ -16,13 +16,17 @@ RESTRICT="mirror"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director ipv6 logwatch mysql ndmp postgres python qt4
+KEYWORDS=""
+IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python qt4
 		readline scsi-crypto sql-pooling +sqlite3 ssl static +storage-daemon tcpd
-		vim-syntax X"
+		vim-syntax X cephfs glusterfs lmdb rados"
 
 DEPEND="
 	!app-backup/bacula
+	cephfs? ( sys-cluster/ceph )
+	rados? ( sys-cluster/ceph )
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp
 	!clientonly? (
 		postgres? ( virtual/postgresql[threads] )
@@ -34,6 +38,7 @@ DEPEND="
 		dev-qt/qtsvg:4
 		x11-libs/qwt:5
 	)
+	fastlz? ( dev-libs/bareos-fastlzlib )
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( sys-apps/tcp-wrappers )
 	readline? ( sys-libs/readline )
@@ -46,10 +51,10 @@ DEPEND="
 	)
 	!static? (
 		acl? ( virtual/acl )
-		sys-libs/zlib
 		dev-libs/lzo
-		sys-libs/ncurses
 		ssl? ( dev-libs/openssl )
+		sys-libs/ncurses
+		sys-libs/zlib
 	)
 	python? ( ${PYTHON_DEPS} )
 	"
@@ -155,6 +160,7 @@ src_configure() {
 		$(use_enable !readline conio) \
 		$(use_enable scsi-crypto) \
 		$(use_enable sql-pooling) \
+		$(use_with fastlz) \
 		$(use_with mysql) \
 		$(use_with postgres postgresql) \
 		$(use_with python) \
@@ -163,6 +169,10 @@ src_configure() {
 		$(use sqlite3 || echo "--without-sqlite3") \
 		$(use_with ssl openssl) \
 		$(use_with tcpd tcp-wrappers) \
+		$(use_enable lmdb) \
+		$(use_with glusterfs) \
+		$(use_with rados) \
+		$(use_with cephfs) \
 		"
 
 	econf \
@@ -176,6 +186,7 @@ src_configure() {
 		--with-logdir=/var/log/bareos \
 		--with-scriptdir=/usr/libexec/bareos \
 		--with-plugindir=/usr/$(get_libdir)/${PN}/plugin \
+		--with-backenddir=/usr/$(get_libdir)/${PN}/backend \
 		--with-dir-user=bareos \
 		--with-dir-group=bareos \
 		--with-sd-user=root \
@@ -183,8 +194,10 @@ src_configure() {
 		--with-fd-user=root \
 		--with-fd-group=bareos \
 		--with-sbin-perm=0755 \
+		--with-systemd \
 		--enable-smartalloc \
 		--enable-dynamic-cats-backends \
+		--enable-dynamic-storage-backends \
 		--enable-batch-insert \
 		--disable-afs \
 		--host=${CHOST} \
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index 910a413d0d2a..caf28ee39991 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -6,13 +6,17 @@
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 	<use>
+		<flag name='cephfs'>Enable cephfs storage backend</flag>
 		<flag name='clientonly'>Only install file-daemon (client)</flag>
 		<flag name='director'>Install director</flag>
-		<flag name='storage-daemon'>Install storage daemon (bareos-sd)</flag>
-		<flag name='logwatch'>Install support files for logwatch</flag>
 		<flag name='fastlz'>Enable support vor lz4, lz4hc and lzfast using dev-libs/bareos-fastlzlib</flag>
+		<flag name='glusterfs'>Enable glusterfs storage backend</flag>
+		<flag name='lmdb'>enable build of LMDB support for faster accurate backup</flag>
+		<flag name='logwatch'>Install support files for logwatch</flag>
 		<flag name='ndmp'>Enable support for NDMP (Network Data Management Protocol)</flag>
-		<flag name='sql-pooling'>Enable SQL pooling support</flag>
+		<flag name='rados'>Enable rados storage backend</flag>
 		<flag name='scsi-crypto'>Enable low level SCSI crypto support</flag>
+		<flag name='sql-pooling'>Enable SQL pooling support</flag>
+		<flag name='storage-daemon'>Install storage daemon (bareos-sd)</flag>
 	</use>
 </pkgmetadata>