From: Marc Schiffbauer <mschiff@gentoo.org>
Date: Sat, 19 Sep 2015 00:13:54 +0000 (+0200)
Subject: app-backup/bareos: add new USE: gnutls, jansson, rados-striper
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c0ae85250c6a8930b53d7a79b6dda24a354fb85;p=gentoo.git

app-backup/bareos: add new USE: gnutls, jansson, rados-striper

Package-Manager: portage-2.2.20.1
---

diff --git a/app-backup/bareos/bareos-15.2.1.ebuild b/app-backup/bareos/bareos-15.2.1.ebuild
index 3ae97b3b47c5..b129f8cf1144 100644
--- a/app-backup/bareos/bareos-15.2.1.ebuild
+++ b/app-backup/bareos/bareos-15.2.1.ebuild
@@ -17,14 +17,15 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python qt4
-		readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon tcpd
-		vim-syntax X cephfs glusterfs lmdb rados"
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb logwatch
+	mysql ndmp postgres python qt4 rados rados-striper readline scsi-crypto sql-pooling
+	+sqlite ssl static +storage-daemon tcpd vim-syntax"
 
 DEPEND="
 	!app-backup/bacula
 	cephfs? ( sys-cluster/ceph )
 	rados? ( sys-cluster/ceph )
+	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
 	glusterfs? ( sys-cluster/glusterfs )
 	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp:0
@@ -32,7 +33,10 @@ DEPEND="
 		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
-		director? ( virtual/mta )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson )
+		)
 	)
 	qt4? (
 		dev-qt/qtsvg:4
@@ -47,12 +51,18 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		ssl? ( dev-libs/openssl:0[static-libs] )
+		ssl? (
+			!gnutls? ( dev-libs/openssl:0[static-libs] )
+			gnutls? ( net-libs/gnutls[static-libs] )
+		)
 	)
 	!static? (
 		acl? ( virtual/acl )
 		dev-libs/lzo
-		ssl? ( dev-libs/openssl:0 )
+		ssl? (
+			!gnutls? ( dev-libs/openssl:0 )
+			gnutls? ( net-libs/gnutls )
+		)
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
@@ -172,7 +182,9 @@ src_configure() {
 		$(use_enable lmdb) \
 		$(use_with glusterfs) \
 		$(use_with rados) \
+		$(use_with rados-striper) \
 		$(use_with cephfs) \
+		$(use_with jansson) \
 		"
 
 	econf \
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index f7f835f420b1..b88526ae61c2 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -11,10 +11,13 @@
     <flag name="director">Install director</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="gnutls">When ssl is enabled, use GnuTLS instead of OpenSSL</flag>
+    <flag name="jansson">JSON API support using JANSSON for director</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="rados">Enable rados storage backend</flag>
+    <flag name="rados-striper">Enable use of rados-striper</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>