commit: fba133b98325e41ebea49019dec96e105522993d
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:45:25 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:45:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba133b9
app-backup/bareos: add libressl support
Package-Manager: portage-2.2.26
app-backup/bareos/bareos-13.2.4-r1.ebuild | 18 ++++++++++++------
app-backup/bareos/bareos-14.2.2.ebuild | 18 ++++++++++++------
app-backup/bareos/bareos-14.2.5.ebuild | 18 ++++++++++++------
app-backup/bareos/bareos-15.2.2.ebuild | 18 ++++++++++++------
4 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/app-backup/bareos/bareos-13.2.4-r1.ebuild
b/app-backup/bareos/bareos-13.2.4-r1.ebuild
index b27d116..3b8d01f 100644
--- a/app-backup/bareos/bareos-13.2.4-r1.ebuild
+++ b/app-backup/bareos/bareos-13.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,9 +17,9 @@ RESTRICT="mirror"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-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"
+IUSE="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp
postgres
+ python qt4 readline scsi-crypto sql-pooling +sqlite ssl static
+storage-daemon
+ tcpd vim-syntax X"
DEPEND="
!app-backup/bacula
@@ -43,12 +43,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? (
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ )
)
!static? (
acl? ( virtual/acl )
dev-libs/lzo
- ssl? ( dev-libs/openssl:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
sys-libs/ncurses:=
sys-libs/zlib
)
diff --git a/app-backup/bareos/bareos-14.2.2.ebuild
b/app-backup/bareos/bareos-14.2.2.ebuild
index 0f83dbc..4ca6821 100644
--- a/app-backup/bareos/bareos-14.2.2.ebuild
+++ b/app-backup/bareos/bareos-14.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,9 +17,9 @@ RESTRICT="mirror"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-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="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp
postgres
+ python qt4 readline scsi-crypto sql-pooling +sqlite ssl static
+storage-daemon
+ tcpd vim-syntax X cephfs glusterfs lmdb rados"
DEPEND="
!app-backup/bacula
@@ -47,12 +47,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? (
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ )
)
!static? (
acl? ( virtual/acl )
dev-libs/lzo
- ssl? ( dev-libs/openssl:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
sys-libs/ncurses:=
sys-libs/zlib
)
diff --git a/app-backup/bareos/bareos-14.2.5.ebuild
b/app-backup/bareos/bareos-14.2.5.ebuild
index 0f83dbc..4ca6821 100644
--- a/app-backup/bareos/bareos-14.2.5.ebuild
+++ b/app-backup/bareos/bareos-14.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,9 +17,9 @@ RESTRICT="mirror"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-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="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp
postgres
+ python qt4 readline scsi-crypto sql-pooling +sqlite ssl static
+storage-daemon
+ tcpd vim-syntax X cephfs glusterfs lmdb rados"
DEPEND="
!app-backup/bacula
@@ -47,12 +47,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? (
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ )
)
!static? (
acl? ( virtual/acl )
dev-libs/lzo
- ssl? ( dev-libs/openssl:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
sys-libs/ncurses:=
sys-libs/zlib
)
diff --git a/app-backup/bareos/bareos-15.2.2.ebuild
b/app-backup/bareos/bareos-15.2.2.ebuild
index e4ef164..07884d3 100644
--- a/app-backup/bareos/bareos-15.2.2.ebuild
+++ b/app-backup/bareos/bareos-15.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,9 +17,9 @@ RESTRICT="mirror"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-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"
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson
lmdb libressl
+ 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
@@ -52,7 +52,10 @@ DEPEND="
dev-libs/lzo[static-libs]
sys-libs/ncurses:=[static-libs]
ssl? (
- !gnutls? ( dev-libs/openssl:0[static-libs] )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ )
gnutls? ( net-libs/gnutls[static-libs] )
)
)
@@ -60,7 +63,10 @@ DEPEND="
acl? ( virtual/acl )
dev-libs/lzo
ssl? (
- !gnutls? ( dev-libs/openssl:0 )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
gnutls? ( net-libs/gnutls )
)
sys-libs/ncurses:=
