gentoo resync : 04.05.2021

4 files changed, 15 insertions, 21 deletions

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index ad1a12ea7098..c871862a7299 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -17,7 +17,7 @@ AUX tmpfiles.d-bareos.conf 35 BLAKE2B b670a9951d736618456644aacb28fbd2784c640efd
 DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
 DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096 SHA512 2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
 DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626 SHA512 b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
-EBUILD bareos-17.2.10.ebuild 10373 BLAKE2B dfb04bc664c47f10a7fcaa77d61f3432f14c53c585d0ea2b46e9a997995a7c0d181870402f920179c37928384a439aa92d98df27a2ebc4d75a03fe52c39a4350 SHA512 fdfae478a86f778f26667200a8b85b3f9453cdb240b8b02c7d0a01ce8c56f86ae7f16b3923db0a3a1ff4bccb5168191cf26f147316bd356bcbbe2b025bfe43a5
-EBUILD bareos-18.2.10.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
-EBUILD bareos-19.2.9.ebuild 11050 BLAKE2B 0bdb494f6b9b80e5708a19aee86cffc73f090e79f613e01941af4296354a011a2fe04477ad5e785d718a95f33a08d7019b8a422aee2b75fae78800f6bd07383d SHA512 528a8e404f77395c1d71c75bf35c6029247c6d12aa301a2a206d76ee35f48d93cf1d981454cfa57394925da74cbcf236870512ff907c0a85fef6aa8206ee9517
+EBUILD bareos-17.2.10.ebuild 10243 BLAKE2B fd52bf443eab0b6b6f6610fced73f14f43ded6c13b5010b32a986129e20433b57bbdf33bbe1e365ad0cfd6dc2c9ec98ac15a065c83f66d17968464a9bce9f961 SHA512 a2c9dc80ae3894a22cc0c3c4769b8a4d680a807a2531c2807a25184f229661b2a6f5afcd87827966e239bfac78484275c0c95b4e1444d8aea2f90dc39458c569
+EBUILD bareos-18.2.10.ebuild 11298 BLAKE2B 4df50a376a19f744188b8742f2ee0c4d4e559b02392caea1b1de7c4c1180b06e4ea5ac93e2610538a803ba00c0092bdd04016f790000fd2f9bd92acf364ff0c6 SHA512 0809bb8ece48e8cbdd30a8145fba6474c3291f7aff4197a7e221c6b94f9f9e5d3ba3272f9e0c83da01562071ecc85b9cd6be012bc6e47409b21d6788cc1a0828
+EBUILD bareos-19.2.9.ebuild 10924 BLAKE2B 7ed3781f4bd5e27455dca9485d6fe2cdf28d1fdec7b6f38e6fcd7430481359cf10e5f6be3f27986f556aff55cff20f1bab3a55597c09a1e902793232db7f4e2e SHA512 e6c06012495478d0b8140bf979637d52da60fd3b1e6289e1f5d56741679dac272c40394137bf3b988cef105141b302ee3fa290908b71b3926527721db213113a
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-17.2.10.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild
index f4a2b487a99f..bcf92fecb1cb 100644
--- a/app-backup/bareos/bareos-17.2.10.ebuild
+++ b/app-backup/bareos/bareos-17.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb
 	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
@@ -48,8 +48,7 @@ DEPEND="
 		sys-libs/ncurses:=[static-libs]
 		ssl? (
 			!gnutls? (
-				!libressl? ( dev-libs/openssl:0=[static-libs] )
-				libressl? ( dev-libs/libressl:0=[static-libs] )
+				dev-libs/openssl:0=[static-libs]
 			)
 			gnutls? ( net-libs/gnutls[static-libs] )
 		)
@@ -59,8 +58,7 @@ DEPEND="
 		dev-libs/lzo
 		ssl? (
 			!gnutls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
+				dev-libs/openssl:0=
 			)
 			gnutls? ( net-libs/gnutls )
 		)
diff --git a/app-backup/bareos/bareos-18.2.10.ebuild b/app-backup/bareos/bareos-18.2.10.ebuild
index cf1622b6e1ad..9f8f8def1767 100644
--- a/app-backup/bareos/bareos-18.2.10.ebuild
+++ b/app-backup/bareos/bareos-18.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb
 	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
@@ -51,8 +51,7 @@ DEPEND="
 		sys-libs/ncurses:=[static-libs]
 		ssl? (
 			!gnutls? (
-				!libressl? ( dev-libs/openssl:0=[static-libs] )
-				libressl? ( dev-libs/libressl:0=[static-libs] )
+				dev-libs/openssl:0=[static-libs]
 			)
 			gnutls? ( net-libs/gnutls[static-libs] )
 		)
@@ -62,8 +61,7 @@ DEPEND="
 		dev-libs/lzo
 		ssl? (
 			!gnutls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
+				dev-libs/openssl:0=
 			)
 			gnutls? ( net-libs/gnutls )
 		)
diff --git a/app-backup/bareos/bareos-19.2.9.ebuild b/app-backup/bareos/bareos-19.2.9.ebuild
index 7487d9136008..e2d48fb23962 100644
--- a/app-backup/bareos/bareos-19.2.9.ebuild
+++ b/app-backup/bareos/bareos-19.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
 	logwatch mysql ndmp +postgres readline scsi-crypto
 	sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
 
@@ -49,14 +49,12 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		!libressl? ( dev-libs/openssl:0=[static-libs] )
-		libressl? ( dev-libs/libressl:0=[static-libs] )
+		dev-libs/openssl:0=[static-libs]
 	)
 	!static? (
 		acl? ( virtual/acl )
 		dev-libs/lzo
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)