Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/
Date: Fri, 30 Apr 2021 17:32:34
Message-Id: 1619803944.574fcf1fd08ea4b79e96037ab1a2e9078c7a4dfb.zlogene@gentoo
1 commit: 574fcf1fd08ea4b79e96037ab1a2e9078c7a4dfb
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 17:21:34 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 17:32:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574fcf1f
7
8 app-backup/bareos: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 app-backup/bareos/bareos-17.2.10.ebuild | 10 ++++------
14 app-backup/bareos/bareos-18.2.10.ebuild | 10 ++++------
15 app-backup/bareos/bareos-19.2.9.ebuild | 10 ++++------
16 3 files changed, 12 insertions(+), 18 deletions(-)
17
18 diff --git a/app-backup/bareos/bareos-17.2.10.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild
19 index f4a2b487a99..bcf92fecb1c 100644
20 --- a/app-backup/bareos/bareos-17.2.10.ebuild
21 +++ b/app-backup/bareos/bareos-17.2.10.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI="7"
28 @@ -13,7 +13,7 @@ RESTRICT="mirror"
29 LICENSE="AGPL-3"
30 SLOT="0"
31 KEYWORDS="~amd64 ~x86"
32 -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
33 +IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb
34 logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
35 sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
36 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
37 @@ -48,8 +48,7 @@ DEPEND="
38 sys-libs/ncurses:=[static-libs]
39 ssl? (
40 !gnutls? (
41 - !libressl? ( dev-libs/openssl:0=[static-libs] )
42 - libressl? ( dev-libs/libressl:0=[static-libs] )
43 + dev-libs/openssl:0=[static-libs]
44 )
45 gnutls? ( net-libs/gnutls[static-libs] )
46 )
47 @@ -59,8 +58,7 @@ DEPEND="
48 dev-libs/lzo
49 ssl? (
50 !gnutls? (
51 - !libressl? ( dev-libs/openssl:0= )
52 - libressl? ( dev-libs/libressl:0= )
53 + dev-libs/openssl:0=
54 )
55 gnutls? ( net-libs/gnutls )
56 )
57
58 diff --git a/app-backup/bareos/bareos-18.2.10.ebuild b/app-backup/bareos/bareos-18.2.10.ebuild
59 index cf1622b6e1a..9f8f8def176 100644
60 --- a/app-backup/bareos/bareos-18.2.10.ebuild
61 +++ b/app-backup/bareos/bareos-18.2.10.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2020 Gentoo Authors
64 +# Copyright 1999-2021 Gentoo Authors
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI="7"
68 @@ -16,7 +16,7 @@ RESTRICT="mirror"
69 LICENSE="AGPL-3"
70 SLOT="0"
71 KEYWORDS="~amd64 ~x86"
72 -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
73 +IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb
74 logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
75 sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
76 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
77 @@ -51,8 +51,7 @@ DEPEND="
78 sys-libs/ncurses:=[static-libs]
79 ssl? (
80 !gnutls? (
81 - !libressl? ( dev-libs/openssl:0=[static-libs] )
82 - libressl? ( dev-libs/libressl:0=[static-libs] )
83 + dev-libs/openssl:0=[static-libs]
84 )
85 gnutls? ( net-libs/gnutls[static-libs] )
86 )
87 @@ -62,8 +61,7 @@ DEPEND="
88 dev-libs/lzo
89 ssl? (
90 !gnutls? (
91 - !libressl? ( dev-libs/openssl:0= )
92 - libressl? ( dev-libs/libressl:0= )
93 + dev-libs/openssl:0=
94 )
95 gnutls? ( net-libs/gnutls )
96 )
97
98 diff --git a/app-backup/bareos/bareos-19.2.9.ebuild b/app-backup/bareos/bareos-19.2.9.ebuild
99 index 7487d913600..e2d48fb2396 100644
100 --- a/app-backup/bareos/bareos-19.2.9.ebuild
101 +++ b/app-backup/bareos/bareos-19.2.9.ebuild
102 @@ -1,4 +1,4 @@
103 -# Copyright 1999-2020 Gentoo Authors
104 +# Copyright 1999-2021 Gentoo Authors
105 # Distributed under the terms of the GNU General Public License v2
106
107 EAPI=7
108 @@ -17,7 +17,7 @@ RESTRICT="mirror"
109 LICENSE="AGPL-3"
110 SLOT="0"
111 KEYWORDS="~amd64 ~x86"
112 -IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl
113 +IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
114 logwatch mysql ndmp +postgres readline scsi-crypto
115 sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
116
117 @@ -49,14 +49,12 @@ DEPEND="
118 sys-libs/zlib[static-libs]
119 dev-libs/lzo[static-libs]
120 sys-libs/ncurses:=[static-libs]
121 - !libressl? ( dev-libs/openssl:0=[static-libs] )
122 - libressl? ( dev-libs/libressl:0=[static-libs] )
123 + dev-libs/openssl:0=[static-libs]
124 )
125 !static? (
126 acl? ( virtual/acl )
127 dev-libs/lzo
128 - !libressl? ( dev-libs/openssl:0= )
129 - libressl? ( dev-libs/libressl:0= )
130 + dev-libs/openssl:0=
131 sys-libs/ncurses:=
132 sys-libs/zlib
133 )